Merge branch 'cleanup/typos' into 'master'

Oliver Sanderrequested to merge
cherry-pick-2772e01e into releases/2.5

[cleanup] fix some typos

See merge request !125 (merged)

Merge request reports