fix typos
Merge pull request #5042
Merge pull request #5042 in master