Merge branch 'kb/windows-force-utf8'