Merge pull request #3514 from ntherning/more-reliable-g_get_home_dir-on-windows