Merge commit 'refs/top-bases/t/blame/extra-columns' into t/blame/extra-columns