Merge branch 'develop'
Fix typo.
Merge branch 'hotfix' into develop