Merge branch '3.1.x'

diff --cc .github/workflows/tests.yaml
Simple merge

diff --cc CHANGES.rst
index 758beaeb9d3d320f54018a843752c2cb38db3379,7fb72976331c865de2440db8054802fffefc5bb3..f23b6c96f77c3dae0635d35ba6ed6b710eb8e64e
--- 1/CHANGES.rst
--- 2/CHANGES.rst
+++ b/CHANGES.rst
@@@ -1,16 -1,21 +1,32 @@@
  .. 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.5
+ -------------
+ 
+ Unreleased
+ 
+ -   Calling sync ``render`` for an async template uses ``asyncio.run``.
+     :pr:`1952`
+ -   Avoid unclosed ``auto_aiter`` warnings. :pr:`1960`
+ -   Return an ``aclose``-able ``AsyncGenerator`` from
+     ``Template.generate_async``. :pr:`1960`
+ -   Avoid leaving ``root_render_func()`` unclosed in
+     ``Template.generate_async``. :pr:`1960`
+ -   Avoid leaving async generators unclosed in blocks, includes and extends.
+     :pr:`1960`
+ 
+ 
  Version 3.1.4
  -------------
  

diff --cc src/jinja2/environment.py
Simple merge

diff --cc tox.ini
index f7bc0b3b5c611595eb0452b5fd48393c16de27d2,b9e972b9391beaee42ce5585107f68288e825054..bb84c67e5a4c9d8ad710149ff38b1857acf761eb
--- 1/tox.ini
--- 2/tox.ini
+++ b/tox.ini
@@@ -1,6 -1,6 +1,6 @@@
  [tox]
  envlist =
-     py3{12,11,10,9,8}
 -    py3{13,12,11,10,9,8,7}
++    py3{13,12,11,10,9,8}
      pypy310
      style
      typing