Hopefully fix the Windows build.
Merge pull request #2307 from chrisvest/1.9-fix-windows-build

Hopefully fix the Windows build.