Merge branch 'msvc' into master (dummy merge)