Merge branch 'jk/blame-line-porcelain'