Merge branch 'maint' * maint: format-patch: generate MIME header as needed even when there is format.header