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