Merge branch 'mk/blame-first-parent'