Merge branch 'jk/format-patch-quote-special-in-from' into maint