Merge branch '2.9-maintenance'

diff --cc CHANGES
Simple merge

diff --cc jinja2/compiler.py
Simple merge

diff --cc jinja2/idtracking.py
index 276e3902b288b764978b6d7f2e0f8f3c65f465f0,8479b72c2309c6bf8db7cee4c160f10c9a824fdf..db60c443a74308091ff6b2dfa96dc64535a6a9a9
--- 1/jinja2/idtracking.py
--- 2/jinja2/idtracking.py
+++ b/jinja2/idtracking.py
@@@ -169,13 -167,7 +169,11 @@@ class RootVisitor(NodeVisitor)
          for child in node.iter_child_nodes(exclude=('call',)):
              self.sym_visitor.visit(child)
  
 +    def visit_OverlayScope(self, node, **kwargs):
 +        for child in node.body:
 +            self.sym_visitor.visit(child)
 +
      def visit_For(self, node, for_branch='body', **kwargs):
-         if node.test is not None:
-             self.sym_visitor.visit(node.test)
          if for_branch == 'body':
              self.sym_visitor.visit(node.target, store_as_param=True)
              branch = node.body