…
Merge branch 'hotfix/travis3'