Merge branch 'pt/git-gui' into maint