Merge branch 'jt/format-patch'