Update .travis.yml
Fix compiler warning
Merge branch 'feature/travis' into develop