Merge branch '3.4' into 4.2

* 3.4:
  Correct many-to-many to many-to-one

Author: javiereguiluz

form/form_collections.rst

@@ -635,7 +635,7 @@ the relationship between the removed ``Tag`` and ``Task`` object.
     ``Tag`` is properly removed.
 
     In Doctrine, you have two sides of the relationship: the owning side and the
-    inverse side. Normally in this case you'll have a many-to-many relationship
+    inverse side. Normally in this case you'll have a many-to-one relationship
     and the deleted tags will disappear and persist correctly (adding new
     tags also works effortlessly).