Merge "Change scope of GlyphBufferData" into devel/master