merge of r6039 through r6333

git-svn-id: https://svn.code.sf.net/p/mingw-w64/code@6334 4407c894-4637-0410-b4f5-ada5f102cad1