Merge branch 'ss/git-gui-mergetool' into next