fix travis
Merge branch 'master' into develop
fix travis