Merge branch 'jm/format-patch-no-auto-n-when-k-is-given' into maint