Merge branch 'cleanup/typos' into 'master'

Markus Blattrequested to merge
cherry-pick-e50c4952 into releases/2.5

[cleanup] fix some typos

See merge request !72 (merged)

Merge request reports