Reformet, remove win32 crap char, no functional changes
Backport