Merge pull request #1921 from SpecLad:defined-msc-ver