Merge commit 'origin/master' into msys

Merge commit 'origin/master' into msys

Conflicts:
	bin/msys-1.0.dll
	mingw/bin/addr2line.exe
	mingw/bin/ar.exe
	mingw/bin/as.exe
	mingw/bin/c++filt.exe
	mingw/bin/cpp.exe
	mingw/bin/dlltool.exe
	mingw/bin/dllwrap.exe
	mingw/bin/gcc.exe
	mingw/bin/gcov.exe
	mingw/bin/gprof.exe
	mingw/bin/ld.exe
	mingw/bin/nm.exe
	mingw/bin/objcopy.exe
	mingw/bin/objdump.exe
	mingw/bin/ranlib.exe
	mingw/bin/readelf.exe
	mingw/bin/size.exe
	mingw/bin/strings.exe
	mingw/bin/strip.exe
	mingw/bin/windres.exe

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>