Merge branch 'jc/blame' into jc/web-blame