am a16583a0: Merge "Fix windows/mingw build."

* commit 'a16583a0880f574937f08bf2c86be72b0f4b9274':
  Fix windows/mingw build.