Fixed nasty hidden UTF8/NFC boundary issue that only appear in Windows
Merge branch 'dev' into ms