Fixed typos
minor #4126 Rebased #3848 (WouterJ)

This PR was merged into the 2.3 branch.

Discussion
----------

Rebased #3848

Rebased version of @pborreli's #3848

Commits
-------

6a303ff Fixed typos