release 1.1 commit 1
Merge branch 'release/jimmy-1.1' into develop

* release/jimmy-1.1:
  release 1.1 commit 1