Merge branch 'jc/blame-no-follow'