Merge branch 'fix-msvc-linker-flags-typo' into release-3.1