Merge branch 'jk/format-patch-multiline-header' into maint