Fix a typo in MSVC build.
Merge branch 'master' into merge-2.064