Merge pull request #3526 from Karlson2k/win32_projects_cleanup_02