Merge branch 'hotfix/1.1.1'
Updated gems
Merge branch 'hotfix/1.1.2' into develop