Merge branch '2.10.x'

diff --cc CHANGES.rst
index d7e88faa9e991f0d84a2023cf302afb03dcafba4,28f32781d9e7c0149a7fd5b43edb3d44d528fb60..a41b887dd0ebe1a15ace0ecf1b5e93a17f921b30
--- 1/CHANGES.rst
--- 2/CHANGES.rst
+++ b/CHANGES.rst
@@@ -4,20 -2,16 +4,30 @@@ Jinja Changelo
  ===============
  
  
 +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. (`#765`_)
 +- Python 2.6 and 3.3 are not supported anymore.
 +- The `map` filter in async mode now automatically awaits
 +
 +.. _#765: https://github.com/pallets/jinja/issues/765
 +
 +
+ Version 2.10.1
+ --------------
+ 
+ Released 2019-04-06
+ 
+ -   ``SandboxedEnvironment`` securely handles ``str.format_map`` in
+     order to prevent code execution through untrusted format strings.
+     The sandbox already handled ``str.format``.
+ 
+ 
  Version 2.10
  ------------
  

diff --cc jinja2/sandbox.py
Simple merge