Merge pull request #6307 from jwilk/spelling