Merge "Enable Type1 and Type1CID fonts"