Merge branch '2.3' into 2.7

* 2.3:
  made Symfony compatible with both Twig 1.x and 2.x

src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/StubFilesystemLoader.php

@@ -18,6 +18,6 @@ class StubFilesystemLoader extends \Twig_Loader_Filesystem
         // strip away bundle name
         $parts = explode(':', $name);
 
-        return parent::findTemplate(end($parts));
+        return parent::findTemplate(end($parts), $throw);
     }
 }