fix typos
Merge branch 'master' into feature/deploy-command