Fix travis
Merge branch 'fix-travis'