Fix typos
Merge branch 'develop' - fix typos.