[Fix] Adapt travis stuff
Merge branch 'master' into develop