Merge pull request #3199 from Karlson2k/win32_home_fix_02