Merge branch 'ew/abbrev' into next