SERVER-13390: test.exe crash (core) on windows 64 2k8
Merge remote-tracking branch 'upstream/master'