Deps fix
Merge branch 'hotfix/travis-fix'
Version bump
Merge branch 'hotfix/travis-fix'