Merge branch 'jc/web-blame'