Merge pull request #7969 from jwilk/spelling