Merge branch 'master' into rooted-and-netloc-redux

Author: wsanchez

tox.ini

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