(upstream git commit ba6fa48d31091a151b10dd47986602889731a893) Fix int->char conversions (upstream git commit ea4af183171bcc1d775af301d9e8bd8db9405cc7)
(upstream git commit ba6fa48d31091a151b10dd47986602889731a893) Fix int->char conversions (upstream git commit ea4af183171bcc1d775af301d9e8bd8db9405cc7)