Merge branch 'release-1.1.1' into develop

* release-1.1.1:
  Bumping version to 1.1.1