Merge "Fix SVACE error in BitmapFont" into devel/master