Merge pull request #3948 from henricm/fix-pinvoke-utf8-windows