Merge branch 'mingw-w64' into multi-rebase