merge from experimental

git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/trunk@6354 4407c894-4637-0410-b4f5-ada5f102cad1
merge from experimental

git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/trunk@6356 4407c894-4637-0410-b4f5-ada5f102cad1