Merge branch '3.0.x'

diff --cc CHANGES.rst
index 18cc04b1e5f85ce4b83535e0eab94893da9e4cbd,fc540af5abfbf60231247c4c6c7aaad3ffb45bb4..a34349676f7545f1c576005cb0c1229b6d055e60
--- 1/CHANGES.rst
--- 2/CHANGES.rst
+++ b/CHANGES.rst
@@@ -1,12 -1,6 +1,12 @@@
  .. currentmodule:: jinja2
  
- Version 3.0.1
 +Version 3.1.0
 +-------------
 +
 +Unreleased
 +
 +
+ Version 3.0.2
  -------------
  
  Unreleased