Merge branch 'release/1.0' into develop
Fix error in attribute definitions
Bumping to 1.1
Merge branch 'release/1.1'