Fix travis file content
Merge from upstream