travis fix 3
Merge branch 'hotfix/TravisFix3'