Merge branch 'jk/branch-shortening-funny-symrefs' into maint