Merge pull request #258 from Alexpux/mingw-w64-builds

Backort changes from develop branch