Merge branch 'rj/msvc-build'