Fix travis
Merge