Merge branch 'master' into strategies

Author: wsanchez

tox.ini

@@ -237,7 +237,7 @@ skip_install = True
 
 deps =
     coverage==4.5.4
-    codecov==2.0.21
+    codecov==2.0.22
 
 commands =
     # Note documentation for CI variables in default environment's passenv