Merge branch 'qn/blame-show-email'