Fix Win32 build.
Merge remote-tracking branch 'upstream/master'