Merge branch 'hotfix/travis-ci' into develop