Merge branch 'release/1.1' into develop
asddsfsdf
adsfdasf
adsgasdg (+1 squashed commit)
Squashed commits:
[5b2fb9d] adsgsdag
version X
Merge branch 'develop'

* develop:
  adsgasdg (+1 squashed commit) Squashed commits: [5b2fb9d] adsgsdag
  adsfdasf
  asddsfsdf