Merge branch 'msvc'