Fix travis
Merge commit 'cfdc91f'