Merge branch 'jc/maint-format-patch' into maint