Fix travis yaml file
Merge branch 'master' into ci-enumerators