Win32 buildfix.
Merge pull request #6194 from thedax/win32-buildfix

Win32 buildfix.