Merge branch '3.1' into 3.2

* 3.1:
  [Serializer] Add missing conflict for property-info<3.1

src/Symfony/Component/Serializer/composer.json

@@ -31,6 +31,7 @@
     },
     "conflict": {
         "symfony/property-access": ">=3.0,<3.0.4|>=2.8,<2.8.4",
+        "symfony/property-info": "<3.1",
         "symfony/yaml": "<3.1"
     },
     "suggest": {

src/Symfony/Component/VarDumper/Tests/CliDumperTest.php

@@ -289,7 +289,7 @@ stream resource {@{$ref}
       %sTemplate.php:%d: {
         : try {
         :     \$this->display(\$context);
-        : } catch (Exception \$e) {
+        : } catch (%s \$e) {
       }
       %sCliDumperTest.php:{$line}: {
         :         }