Merge branch 'jc/format-patch-force-in-body-from'