Merge branch 'devel' of repo.or.cz:/srv/git/msysgit into devel