Merge branch 'master' into async-streaming

diff --cc docs/conf.py
index adf4db2f529e2d3dd515c3ead16266764b2dc35e,0c65b0b3a18514b5fe65b9f9791b1734ee02f957..81ac5be17efda6e4e66f5bf226636ef35a766974
--- 1/docs/conf.py
--- 2/docs/conf.py
+++ b/docs/conf.py
@@@ -33,15 -33,9 +33,15 @@@ extensions = 
  
  intersphinx_mapping = {
    'python': ('https://docs.python.org/3', None),
-   'requests': ('https://docs.python-requests.org/en/latest/', None)
 +  'aiohttp': ('https://docs.aiohttp.org/en/stable/', None),
+   'requests': ('https://docs.python-requests.org/en/stable/', None)
  }
  
 +rst_prolog = """
 +.. |coroutine| replace:: This function is a coroutine_.
 +.. _coroutine: https://docs.python.org/3/library/asyncio-task.html#coroutine
 +"""
 +
  # Add any paths that contain templates here, relative to this directory.
  #templates_path = ['_templates']