Merge branch 'release/1.1.0'
Fix a typo
Merge branch 'hotfix/1.1.1' into develop