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