Merge branch 'jc/maint-mergetool-read-fix' into maint