fix
Merge branch 'hotfix/travis'
Merge tag 'travis' into develop

travis-bundle