Merge "Fix windows/mingw build."