Merge branch 'jc/rev-list-simplify-merges-first-parent' into maint