Merge branch 'jc/mergetool-tool-help' into maint