Fix .travis.yml
Merge branch 'develop' into feature/glob-load