am 449273e2: Merge "Fix for positioning of glyphs within a bitmap"

* commit '449273e2d575041ffe1a5d435666d36923de888b':
  Fix for positioning of glyphs within a bitmap