Merge branch '3.0.x'

diff --cc .pre-commit-config.yaml
index 356b49c8ce18f52b7f6d95b65b57be9da731e781,0778c54e8592207a1e50aa0648c9b973ff76fdcf..39806ed635a905749f24c7f8ad4a37c36ce2b1fd
--- 1/.pre-commit-config.yaml
--- 2/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@@ -2,10 -2,10 +2,10 @@@ ci
    autoupdate_schedule: monthly
  repos:
    - repo: https://github.com/asottile/pyupgrade
-     rev: v2.29.0
+     rev: v2.29.1
      hooks:
        - id: pyupgrade
 -        args: ["--py36-plus"]
 +        args: ["--py37-plus"]
    - repo: https://github.com/asottile/reorder_python_imports
      rev: v2.6.0
      hooks:

diff --cc docs/api.rst
Simple merge

diff --cc setup.cfg
index 803e8c6cfbcff9475ba5f1018cde8366a6cbe6c8,9dd6c5123de7ad2dc240a3ad567cd6f98030a104..c23d9390950daa6194d40b6d64ef059f37d00d47
--- 1/setup.cfg
--- 2/setup.cfg
+++ b/setup.cfg
@@@ -86,7 -86,8 +86,8 @@@ per-file-ignores 
  
  [mypy]
  files = src/jinja2
 -python_version = 3.6
 +python_version = 3.7
+ show_error_codes = True
  disallow_subclassing_any = True
  disallow_untyped_calls = True
  disallow_untyped_defs = True

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

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

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

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