fix travis
Merge branch 'hotfix/fixtravis'