Updated version.
Merge branch 'release/1.0'
Merge branch 'release/1.0' into develop
updated message
bumped version.
Merge branch 'release/1.1'