Merge git://repo.or.cz/git-gui into maint