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

Author: wsanchez

tox.ini

@@ -82,7 +82,7 @@ deps =
     #flake8-docstrings==1.5.0
     flake8==3.7.9
     mccabe==0.6.1
-    pep8-naming==0.9.1
+    pep8-naming==0.10.0
     pydocstyle==5.0.2
     # pin pyflakes pending a release with https://github.com/PyCQA/pyflakes/pull/455
     git+git://github.com/PyCQA/pyflakes@ffe9386#egg=pyflakes