Merge branch 'hotfix/0.9.6'

* hotfix/0.9.6:
  * Updated gems
* Attempt to fix builds on travis
Merge branch 'hotfix/0.9.7' into develop

* hotfix/0.9.7:
  * Attempt to fix builds on travis