Merge branch '1.x' into 2.x

* 1.x:
  add machine-readable version constants
  Fixing wrong function name in deprecation notice
  bumped version to 1.27.1-DEV
  prepared the 1.27.0 release

CHANGELOG

@@ -17,7 +17,11 @@
  * improved the performance of the filesystem loader
  * removed features that were deprecated in 1.x
 
-* 1.27.0 (2016-XX-XX)
+* 1.27.1 (2016-XX-XX)
+
+ * n/a
+
+* 1.27.0 (2016-10-25)
 
  * deprecated Twig_Parser::getEnvironment()
  * deprecated Twig_Parser::addHandler() and Twig_Parser::addNodeVisitor()

lib/Twig/Environment.php

@@ -17,6 +17,12 @@
 class Twig_Environment
 {
     const VERSION = '2.0.0-DEV';
+    const VERSION = '1.27.1-DEV';
+    const VERSION_ID = 12701;
+    const MAJOR_VERSION = 1;
+    const MINOR_VERSION = 27;
+    const RELEASE_VERSION = 1;
+    const EXTRA_VERSION = 'DEV';
 
     private $charset;
     private $loader;