version updated to 1.1 (milestone)
Merge branch 'release/1.1' into develop