Merge branch '2.3' into 2.5

* 2.3:
  TwigExtractor tests require the Finder component

Conflicts:
	src/Symfony/Bridge/Twig/composer.json

src/Symfony/Bridge/Twig/composer.json

@@ -21,6 +21,7 @@
         "twig/twig": "~1.12"
     },
     "require-dev": {
+        "symfony/finder": "~2.3",
         "symfony/form": "~2.5,<2.6.0",
         "symfony/http-kernel": "~2.2",
         "symfony/routing": "~2.2",
@@ -33,6 +34,7 @@
         "symfony/expression-language": "~2.4"
     },
     "suggest": {
+        "symfony/finder": "",
         "symfony/form": "For using the FormExtension",
         "symfony/http-kernel": "For using the HttpKernelExtension",
         "symfony/routing": "For using the RoutingExtension",