fix travis
Merge branch 'fix-travis-yml' into develop