Code

Merge branch 'jm/mergetool-pathspec' into maint-1.7.6