Merge branch 'jn/maint-format-patch-doc'