this fixes compilation error on win32
Merge remote-tracking branch 'remotes/origin/win32compilefix' into master-rc4