Merge branch 'rr/format-patch-count-without-merges' into next