Merge branch 'hotfix/TravisFix'
Travis Fix
Merge branch 'hotfix/TravisFix2' into develop