Merge remote-tracking branch 'upstream/master' into pganssle-categorical_bools

TomAugspurger · TomAugspurger · commit c1ff9e0431fe · 2018-09-19T11:06:23.000-05:00
diff --git a/.travis.yml b/.travis.yml
@@ -31,6 +31,7 @@ matrix:
       # Exclude the default Python 3.5 build
       - python: 3.5
 
+    include:
     - dist: trusty
       env:
         - JOB="3.7" ENV_FILE="ci/travis-37.yaml" TEST_ARGS="--skip-slow --skip-network"
