Amend 533cade.
Merge branch 'blame-line-number'