Merge branch 'jk/maint-format-patch-p-suppress-stat' into maint