Merge branch 'jc/format-patch-range-diff-fix'