Merge branch '2.9-maintenance'

diff --cc CHANGES
index 70570c7ce35689f1e85f0f19434776f06be60995,f95f41a47576a9e62b003603ab227e6e2b741439..af3eb381e6a240d1812c71bc583a29b7e3884de9
--- 1/CHANGES
--- 2/CHANGES
+++ b/CHANGES
@@@ -1,17 -1,9 +1,17 @@@
  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.
 +
  Version 2.9.4
  -------------
- (unreleased bugfix release)
+ (bugfix release, released on January 10th 2017)
  
  - Solved some warnings for string literals.  (#646)
  - Increment the bytecode cache version which was not done due to an