Merge pull request #4570 from lateralusX/jlorenss/visual_studio_msbuild_fix