Merge branch 'jc/blame-reverse'