Update .travis.yml
Merge branch 'master' into macosx