Merge branch 'master' into NATIVE_TYPES

diff --cc CHANGES
index 5c45b480bf71810fa3d44227ab4cfda670a22ebd,21a60ecfa43c39b30b70ed8abdb4a62875d461a4..7481a61a6eeed086e35e6b673a747d1dfacf14a6
--- 1/CHANGES
--- 2/CHANGES
+++ b/CHANGES
@@@ -42,8 -40,22 +42,23 @@@ Version 2.1
  .. _#665: https://github.com/pallets/jinja/pull/665
  .. _#685: https://github.com/pallets/jinja/pull/685
  .. _#692: https://github.com/pallets/jinja/pull/692
 +.. _#708: https://github.com/pallets/jinja/pull/708
  
+ 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.
+ - Fixed a bug where having many `{% elif ... %}` blocks resulted in a
+   "too many levels of indentation" error.  These blocks now compile to
+   native `elif ..:` instead of `else: if ..:`  (#759)
+ 
+ .. _#718: https://github.com/pallets/jinja/pull/718
+ 
  Version 2.9.6
  -------------
  (bugfix release, released on April 3rd 2017)