Fix handling of multiply-encoded glyphs.
Merge pull request #3570 from brendandahl/encoding-wip

Fix handling of multiply-encoded glyphs.