Merge branch '2.4'

* 2.4:
  [Debug] fix #10313: FlattenException not found because of https://bugs.php.net/42098

src/Symfony/Component/Debug/ErrorHandler.php

@@ -165,6 +165,9 @@ class ErrorHandler
 
                 return true;
             }
+            if (!class_exists('Symfony\Component\Debug\Exception\FlattenException')) {
+                require __DIR__.'/Exception/FlattenException.php';
+            }
 
             if (PHP_VERSION_ID < 50400 && isset($context['GLOBALS']) && is_array($context)) {
                 unset($context['GLOBALS']);