Merge branch '2.9-maintenance'

diff --cc CHANGES
index 1b7b686caceb5be8c7f0ccd7b7271a6bd0f1afa6,8e5b4ab37cf5d5f382df054314eb39cae8dfecbd..c37c8b00d67bc3e35a887602c2fe626da3769e2e
--- 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.3
  -------------
- (bugfix release, release date to be decided)
+ (bugfix release, released on January 8th 2017)
  
  - Restored the use of blocks in macros to the extend that was possible
    before.  On Python 3 it would render a generator repr instead of