Merge branch 'jc/combine-diff-many-parents' into maint