Merge branch 'hotfix/10.1.3'

* hotfix/10.1.3:
  Updated gems
* Fixed travis config
Merge branch 'hotfix/10.1.4' into develop

* hotfix/10.1.4:
  * Fixed travis config