Merge pull request #2751 from akoeplinger/fix-msbuild-remapping