Merge branch '3.1.x'

diff --cc CHANGES.rst
index 1269682581c790e76f47eddeee60f43f0374119b,bf670420c0f27a878697dfc21fd17f52521c6ffc..f2121b5032697f51f4d6106f0cce1b94c7e754ea
--- 1/CHANGES.rst
--- 2/CHANGES.rst
+++ b/CHANGES.rst
@@@ -1,16 -1,11 +1,22 @@@
  .. currentmodule:: jinja2
  
 +Version 3.2.0
 +-------------
 +
 +Unreleased
 +
 +-   Drop support for Python 3.7.
 +-   Use modern packaging metadata with ``pyproject.toml`` instead of ``setup.cfg``.
 +    :pr:`1793`
 +-   Use ``flit_core`` instead of ``setuptools`` as build backend.
 +
 +
+ Version 3.1.4
+ -------------
+ 
+ Unreleased
+ 
+ 
  Version 3.1.3
  -------------