Merge pull request #3372 from ntherning/fix-g_win32_getlocale