Merge branch 'master' into mypy

Author: wsanchez

tox.ini

@@ -34,7 +34,7 @@ deps =
     test: coverage==4.5.4
     test: idna==2.8
     test: typing==3.7.4.1
-    test: {py26,py27,py34}: pytest==4.6.6
+    test: {py26,py27,py34}: pytest==4.6.7
     test: {py35,py36,py37,py38}: pytest==5.2.4
     test: pytest-cov==2.8.1