Merge branch 'jh/msvc'