Merge branch 'master' of ssh://git.code.sf.net/p/mingw-w64/mingw-w64