Update travis spec
Update travis spec
Merge branch 'maint'

* maint:
  Update travis spec
Merge branch 'master' into next

* master:
  Update travis spec
  Update travis spec