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

tagging 1.1