Merge branch 'hotfix/TravisFix2'
travis fix 3
Merge branch 'hotfix/TravisFix3' into develop