Merge branch 'master' into mypy

Author: wsanchez

tox.ini

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