Merge branch 'jc/format-patch-reroll'