Merge spelling fixes from 3.4 into 3.5