Merge branch 'jt/format-patch-from-config'