Update .travis.yml
Merge branch 'master' into 2.3

* master:
  Update .travis.yml