Merge branch '2.8' into 3.1

* 2.8:
  [SecurityBundle] Fix Twig master dep

Author: nicolas-grekas

src/Symfony/Bundle/SecurityBundle/composer.json

@@ -30,6 +30,7 @@
         "symfony/framework-bundle": "~2.8|~3.0",
         "symfony/http-foundation": "~2.8|~3.0",
         "symfony/security-acl": "~2.8|~3.0",
+        "symfony/templating": "~2.8|~3.0",
         "symfony/twig-bundle": "~2.8|~3.0",
         "symfony/twig-bridge": "~2.8|~3.0",
         "symfony/process": "~2.8|~3.0",