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