Merge branch 'hotfix/dummy'
Update .travis.yml
Merge branch 'hotfix/travis' into develop