Merge branch '2.10.x'

diff --cc CHANGES.rst
index 692a5161667169959c6d8ee6a625fa79178e63a2,1df6bfedabc800baa804eed0afefadbd979d9d7a..888f9d9176adcf4aee8f6453836a63eb834e9194
--- 1/CHANGES.rst
--- 2/CHANGES.rst
+++ b/CHANGES.rst
@@@ -1,29 -1,14 +1,38 @@@
  .. currentmodule:: jinja2
  
 +Version 2.11
 +------------
 +
 +Unreleased
 +
 +-   Async support is only loaded the first time an
 +    :class:`~environment.Environment` enables it, in order to avoid a
 +    slow initial import. :issue:`765`
 +-   Python 2.6 and 3.3 are not supported anymore.
 +-   The ``map`` filter in async mode now automatically awaits
 +-   Added a new ``ChainableUndefined`` class to support getitem and
 +    getattr on an undefined object. :issue:`977`
 +-   Allow ``{%+`` syntax (with NOP behavior) when ``lstrip_blocks`` is
 +    disabled. :issue:`748`
 +-   Added a ``default`` parameter for the ``map`` filter. :issue:`557`
 +-   Exclude environment globals from
 +    :func:`meta.find_undeclared_variables`. :issue:`931`
 +-   Float literals can be written with scientific notation, like
 +    2.56e-3. :issue:`912`, :pr:`922`
 +-   Int and float literals can be written with the '_' separator for
 +    legibility, like 12_345. :pr:`923`
 +-   Fix a bug causing deadlocks in ``LRUCache.setdefault``. :pr:`1000`
 +
 +
+ Version 2.10.3
+ --------------
+ 
+ Released 2019-10-24
+ 
+ -   Fix a typo in Babel entry point in ``setup.py`` that was preventing
+     installation.
+ 
+ 
  Version 2.10.2
  --------------
  

diff --cc setup.py
Simple merge