Update .travis.yml
[Merge] Merging from Night
Update .travis.yml