Merge remote branch 'pborreli/fix-twibundle'

* pborreli/fix-twibundle:
  [TwigBundle] Removed useless code

src/Symfony/Bundle/TwigBundle/Extension/TemplatingExtension.php

@@ -85,10 +85,6 @@ class TemplatingExtension extends \Twig_Extension
     {
         $options['attributes'] = $attributes;
 
-        if (isset($options['query'])) {
-            $options['query'] = $options['query'];
-        }
-
         return $this->container->get('http_kernel')->render($controller, $options);
     }