fix travis errors
Merge branch 'hotfix/TravisFix'