am 9fc43358: Merge "Extra Win32 compatibility."

* commit '9fc43358f72a581beb26532ea2cb1f2adc053758':
  Extra Win32 compatibility.