Merge branch 'maint-for-junio' of git://repo.or.cz/git/fastimport into maint