Merge branch 'post1.5.1/blame.el'