Merge pull request #2460 from corco/msvc

Replaced clang-cl for MSVC Compiler on Windows