Merge branch '3.1.x'

diff --cc CHANGES.rst
index 788809f907ec2460f709a553b465d86caa31b814,da7d0a68237a459f7879637841583090bfefb6f6..57c121586820b2ef14e09bec081423b2bc9dda16
--- 1/CHANGES.rst
--- 2/CHANGES.rst
+++ b/CHANGES.rst
@@@ -1,11 -1,14 +1,20 @@@
  .. currentmodule:: jinja2
  
 +Version 3.2.0
 +-------------
 +
 +Unreleased
 +
 +
+ Version 3.1.2
+ -------------
+ 
+ Unreleased
+ 
+ -   Add parameters to ``Environment.overlay`` to match ``__init__``.
+     :issue:`1645`
+ 
+ 
  Version 3.1.1
  -------------