New spelling abbrev.
Merge branch 'master' into cyrus