Merge pull request #2369 from akoeplinger/msvc-win64-crash