Merge "Fix for positioning of glyphs within a bitmap"