diff --git a/doctrine-mapping.xsd b/doctrine-mapping.xsd
index 126f30290..c76ae49b0 100644
--- a/doctrine-mapping.xsd
+++ b/doctrine-mapping.xsd
@@ -212,7 +212,7 @@
       <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##other"/>
     </xs:sequence>
     <xs:attribute name="name" type="xs:NMTOKEN" use="optional"/>
-    <xs:attribute name="columns" type="xs:NMTOKENS" use="required"/>
+    <xs:attribute name="columns" type="xs:string" use="required"/>
     <xs:anyAttribute namespace="##other"/>
   </xs:complexType>
   
diff --git a/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php b/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php
index 97617a64d..47eb07c45 100644
--- a/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php
+++ b/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php
@@ -506,6 +506,6 @@ class YamlDriver extends AbstractFileDriver
      */
     protected function _loadMappingFile($file)
     {
-        return \Symfony\Component\Yaml\Yaml::load($file);
+        return \Symfony\Component\Yaml\Yaml::parse($file);
     }
 }
diff --git a/lib/Doctrine/ORM/Tools/ConvertDoctrine1Schema.php b/lib/Doctrine/ORM/Tools/ConvertDoctrine1Schema.php
index ecd04ce6d..1a5600cdb 100644
--- a/lib/Doctrine/ORM/Tools/ConvertDoctrine1Schema.php
+++ b/lib/Doctrine/ORM/Tools/ConvertDoctrine1Schema.php
@@ -70,10 +70,10 @@ class ConvertDoctrine1Schema
             if (is_dir($path)) {
                 $files = glob($path . '/*.yml');
                 foreach ($files as $file) {
-                    $schema = array_merge($schema, (array) \Symfony\Component\Yaml\Yaml::load($file));
+                    $schema = array_merge($schema, (array) \Symfony\Component\Yaml\Yaml::parse($file));
                 }
             } else {
-                $schema = array_merge($schema, (array) \Symfony\Component\Yaml\Yaml::load($path));
+                $schema = array_merge($schema, (array) \Symfony\Component\Yaml\Yaml::parse($path));
             }
         }
 
diff --git a/lib/vendor/Symfony/Component/Console b/lib/vendor/Symfony/Component/Console
index 4200b4bc9..3762cec59 160000
--- a/lib/vendor/Symfony/Component/Console
+++ b/lib/vendor/Symfony/Component/Console
@@ -1 +1 @@
-Subproject commit 4200b4bc95ae3c1b03d943cd875277e35a17898a
+Subproject commit 3762cec59aaecf1e55ed92b2b0b3e7f2d602d09a
diff --git a/lib/vendor/Symfony/Component/Yaml b/lib/vendor/Symfony/Component/Yaml
index 3d864452c..c3e1d03ef 160000
--- a/lib/vendor/Symfony/Component/Yaml
+++ b/lib/vendor/Symfony/Component/Yaml
@@ -1 +1 @@
-Subproject commit 3d864452ca73ae5409f1434b65f0c7204a50e061
+Subproject commit c3e1d03effe339de6940f69a4d0278ea34665702