Merge branch 'jc/maint-mergetool-style-fix' into maint-1.7.11