fix travis
Merge branch 'dev'

* dev:
  fix travis