Update .travis.yml
Update .travis.yml
Merge remote-tracking branch 'upstream/master' into kandan-285

* upstream/master:
  Update .travis.yml
  Update .travis.yml