Update .travis.yml
Merge branch 'origin/master'