Merge branch 'hotfix/travis'
Merge branch 'develop'
dependency status