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

* master:
  Update .travis.yml