Merge branch 'jc/maint-blame-unique-abbrev' into maint