Travis Fix
Merge branch 'hotfix/TravisFix2'