Merge branch 'jc/blame-abbrev'