Merge branch 'master' into tox-docs

Author: wsanchez

tox.ini

@@ -35,7 +35,7 @@ deps =
     test: idna==2.8
     test: typing==3.7.4.1
     test: {py26,py27,py34}: pytest==4.6.6
-    test: {py35,py36,py37,py38}: pytest==5.2.2
+    test: {py35,py36,py37,py38}: pytest==5.2.4
     test: pytest-cov==2.8.1
 
 passenv =