Merge branch '2.9.x' into 2.10.x

diff --cc docs/extensions.rst
index 821185816631abd69a908cd3b9fd4adeb5ea4669,a07b557dd3cf1d4aafba84221fa8133148990cce..fde2ae4b966f47f355c46a0523703913bae11c6f
--- 1/docs/extensions.rst
--- 2/docs/extensions.rst
+++ b/docs/extensions.rst
@@@ -132,7 -123,7 +132,7 @@@ extraction tools in case you are not us
  
  What's the big difference between standard and newstyle gettext calls?  In
  general they are less to type and less error prone.  Also if they are used
- in an :ref:`autescaping` environment they better support automatic escaping.
 -in an autoescaping environment they better support automatic escaping.
++in an :ref:`autoescaping` environment they better support automatic escaping.
  Here are some common differences between old and new calls:
  
  standard gettext: