Merge branch 'hotfix/travis-ci'
Merge branch 'hotfix/travis-ci' into develop