PBI-10 Approval: gucharmap 3.6.1 (josh)