Merge branch 'mh/format-patch-add-header'