Merge branch 'hotfix/tests'
Merge branch 'develop'
travis