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