Update with bakery-encode-glyphs-fix