Merge branch 'master' into msvc-support-master