Update Travis CI config
Merge branch 'refs/heads/develop'