Merge branch '1.x'

* 1.x:
  fixed CS
  bumped version to 1.18.3-DEV
  prepared the 1.18.2 release

Conflicts:
	CHANGELOG
	ext/twig/php_twig.h
	lib/Twig/Environment.php

CHANGELOG

@@ -8,7 +8,11 @@
  * improved the performance of the filesystem loader
  * removed features that were deprecated in 1.x
 
-* 1.18.2 (2015-XX-XX)
+* 1.18.3 (2015-XX-XX)
+
+ * n/a
+
+* 1.18.2 (2015-06-06)
 
  * fixed template/line guessing in exceptions for nested templates
  * optimized the number of inodes and the size of realpath cache when using the cache

lib/Twig/Profiler/Dumper/Html.php

@@ -14,7 +14,7 @@
  */
 class Twig_Profiler_Dumper_Html extends Twig_Profiler_Dumper_Text
 {
-    static private $colors = array(
+    private static $colors = array(
         'block' => '#dfd',
         'macro' => '#ddf',
         'template' => '#ffd',