Fixes typos
Merge pull request #6237
Merge pull request #6237 in master