Merge branch 'kb/blame-author-email'