Merge branch 'hotfix/travis-ci' into develop
YAML tab to double space
Merge branch 'develop'