Merge branch 'hotfix/10.1.2'

* hotfix/10.1.2:
  * Ruby 2.1.4
Updated gems
Merge branch 'hotfix/10.1.3' into develop

* hotfix/10.1.3:
  Updated gems