Merge pull request #6587 from stokito/typos