Merge pull request #3588 from Karlson2k/win32_projects_update_03a