Update .travis.yml
Merge branch 'master' into fix-travis
Merge branch 'fix-travis'