Merge branch 'jc/maint-fmt-merge-msg-no-edit-lose-credit' into maint