merge develop

requirements.txt

@@ -4,7 +4,7 @@ pytest==3.0.3
 pytest-aiohttp==0.1.2
 pytest-asyncio==0.5.0
 pytest-catchlog==1.2.2
-pytest-cov==2.3.1
+pytest-cov==2.4.0
 pytest-flakes==1.0.1
 pytest-mock==1.2
 yarl==0.4.3