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

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