Merge spelling fixes from 3.5