Merge branch '2.9-maintenance'

diff --cc CHANGES
index 383e1a7c58569be45234f6216d14f271f2582289,967b40aa2878c12e93267b76ef88f90e143ae2a1..9550fa46b50d52acd322db9053cbdfa61eb1f732
--- 1/CHANGES
--- 2/CHANGES
+++ b/CHANGES
@@@ -1,16 -1,12 +1,22 @@@
  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`.
 +
+ Version 2.9.6
+ -------------
+ (bugfix release, released on April 3rd 2017)
+ 
+ - Fixed custom context behavior in fast resolve mode (#675)
+ 
  Version 2.9.5
  -------------
  (bugfix release, released on January 28th 2017)

diff --cc setup.py
index b77ff428ec5a3000fe138feb11834666dbc3b5ce,6fc713963f078134204df7eea8da93fad56ed891..ac2f5095cf2e4292c5cb82609446280a1f2a54e3
--- 1/setup.py
--- 2/setup.py
+++ b/setup.py
@@@ -40,7 -40,7 +40,11 @@@ from setuptools import setu
  
  setup(
      name='Jinja2',
++<<<<<<< HEAD
 +    version='2.10.dev',
++=======
+     version='2.9.7.dev',
++>>>>>>> 2.9-maintenance
      url='http://jinja.pocoo.org/',
      license='BSD',
      author='Armin Ronacher',