Merge branch '2.9-maintenance'

diff --cc CHANGES
index c37c8b00d67bc3e35a887602c2fe626da3769e2e,4d8fabb17b72246c79648626ba158c73bab49c82..69475061e0841df20fbea35cf6f31b635e0c0f42
--- 1/CHANGES
--- 2/CHANGES
+++ b/CHANGES
@@@ -1,14 -1,12 +1,20 @@@
  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)
+ 
+ - Solved some warnings for string literals.  (#646)
+ 
  Version 2.9.3
  -------------
  (bugfix release, released on January 8th 2017)

diff --cc jinja2/nodes.py
Simple merge