change travis
Merge remote-tracking branch 'origin/change_travis' into change_travis

* origin/change_travis:
  change travis