Update .travis.yml
Merge branch 'refs/heads/master' into dev
Change .travis.yml for me