Merge branch 'jc/abbrev-auto'