Merge branch 'hotfix/travis'
Updated for travis
Merge branch 'hotfix/travis-boothstrap' into develop