Merge branch '2.9-maintenance'

diff --cc CHANGES
index c7d78b91717b4585d9ef1146c6619517419fa348,38f4508cc8509667af4f4f3125b1e2dc55a031c2..2884ef9eeb2e5d35be92795c994e6d4784ce0dae
--- 1/CHANGES
--- 2/CHANGES
+++ b/CHANGES
@@@ -1,46 -1,18 +1,58 @@@
  Jinja2 Changelog
  ================
  
 +Version 2.10
 +------------
 +(feature release, release date to be decided)
 +
 +- Added a new extension node called `OverlayScope` which can be used to
 +  create an unoptimized scope that will look up all variables from a
 +  derived context.
 +- Added an `in` test that works like the in operator.  This can be used
 +  in combination with `reject` and `select`.
 +- Added `previtem` and `nextitem` to loop contexts, providing access to the
 +  previous/next item in the loop. If such an item does not exist, the value is
 +  undefined.
 +- Added `changed(*values)` to loop contexts, providing an easy way of checking
 +  whether a value has changed since the last iteration (or rather since the
 +  last call of the method)
 +- Added a `namespace` function that creates a special object which allows
 +  attribute assignment using the `set` tag.  This can be used to carry data
 +  across scopes, e.g. from a loop body to code that comes after the loop.
 +- Added a `trimmed` modifier to `{% trans %}` to strip linebreaks and
 +  surrounding whitespace. Also added a new policy to enable this for all
 +  `trans` blocks.
 +- The ``random`` filter is no longer incorrectly constant folded and will
 +  produce a new random choice each time the template is rendered. (`#478`_)
 +- Add a ``unique`` filter. (`#469`_)
 +- Add ``min`` and ``max`` filters. (`#475`_)
 +- Add tests for all comparison operators: ``eq``, ``ne``, ``lt``, ``le``,
 +  ``gt``, ``ge``. (`#665`_)
 +- ``import`` statement cannot end with a trailing comma. (`#617`_, `#618`_)
 +- ``indent`` filter will not indent blank lines by default. (`#685`_)
 +- Add ``reverse`` argument for ``dictsort`` filter. (`#692`_)
 +
 +.. _#469: https://github.com/pallets/jinja/pull/469
 +.. _#475: https://github.com/pallets/jinja/pull/475
 +.. _#478: https://github.com/pallets/jinja/pull/478
 +.. _#617: https://github.com/pallets/jinja/pull/617
 +.. _#618: https://github.com/pallets/jinja/pull/618
 +.. _#665: https://github.com/pallets/jinja/pull/665
 +.. _#685: https://github.com/pallets/jinja/pull/685
 +.. _#692: https://github.com/pallets/jinja/pull/692
 +
+ Version 2.9.7
+ -------------
+ 
+ (bugfix release, in development)
+ 
+ - ``tojson`` filter marks output as safe to match documented behavior.
+   (`#718`_)
+ - Resolved a bug where getting debug locals for tracebacks could
+   modify template context.
+ 
+ .. _#718: https://github.com/pallets/jinja/pull/718
+ 
  Version 2.9.6
  -------------
  (bugfix release, released on April 3rd 2017)

diff --cc jinja2/utils.py
Simple merge

diff --cc tests/test_filters.py
Simple merge