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