Merge branch 'master' into pypy

Author: altendky

tox.ini

@@ -15,10 +15,12 @@ deps=
     qt5reactor: pytest-xvfb
     qt5reactor: pyqt5
     qt5reactor: pywin32; sys_platform == 'win32'
+setenv=
+    defaultreactor: REACTOR = default
+    qt5reactor: REACTOR = qt5reactor
+    asyncioreactor: REACTOR = asyncio
 commands=
-    defaultreactor: pytest --reactor=default
-    qt5reactor: pytest --reactor=qt5reactor
-    asyncioreactor: pytest --reactor=asyncio
+    pytest --reactor={env:REACTOR}
 sitepackages=False
 download=true