[1.5.x] Fixed spelling errors

Backport of ec04fd1344 from master