* Attempt to fix builds on travis
Merge branch 'hotfix/0.9.7'

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