Fix travis integration
Merge branch 'travis' into 8.x-1.x