Merge remote-tracking branch 'mkbosmans/mingw32-build'