Merge branch 'lm/git-blame-el'