Merge branch '2.4' into 2.5

* 2.4:
  [TwigBridge][Trans]set %count% only on transChoice
  [DomCrawler] Fixed a forgotten case of complex XPath queries
  bumped Symfony version to 2.4.6
  updated VERSION for 2.4.5
  updated CHANGELOG for 2.4.5
  bumped Symfony version to 2.3.16
  updated VERSION for 2.3.15
  updated CHANGELOG for 2.3.15

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php

Node/TransNode.php

@@ -98,7 +98,7 @@ protected function compileString(\Twig_NodeInterface $body, \Twig_Node_Expressio
         foreach ($matches[1] as $var) {
             $key = new \Twig_Node_Expression_Constant('%'.$var.'%', $body->getLine());
             if (!$vars->hasElement($key)) {
-                if ('count' === $var) {
+                if ('count' === $var && null !== $this->getNode('count')) {
                     $vars->addElement($this->getNode('count'), $key);
                 } else {
                     $varExpr = new \Twig_Node_Expression_Name($var, $body->getLine());