Merge branch 'release/1.0'
hotfix
Merge branch 'hotfix/1.1' into develop