Merge branch 'cb/maint-mergetool-no-tty'