Merge mingw-w64-builds branch into develop