Fix travis setup
Merge pull request #6558 from tsigo/master

Fix travis setup