Merge branch 'jk/blame-first-parent' into maint