Merge branch 'hotfix/travis3'
…
Merge branch 'hotfix/travis' into develop