Merge branch 'jc/blame-follows-renames'