Update .travis.yml
Merge branch 'hotfix/travis'