Merge branch '6.1' into 6.2

* 6.1:
  [Form] fix EntityType with multiple=true return type

Author: javiereguiluz

reference/forms/types/entity.rst

@@ -236,7 +236,16 @@ These options inherit from the :doc:`ChoiceType </reference/forms/types/choice>`
 
 .. include:: /reference/forms/types/options/group_by.rst.inc
 
-.. include:: /reference/forms/types/options/multiple.rst.inc
+``multiple``
+~~~~~~~~~~~~
+
+**type**: ``boolean`` **default**: ``false``
+
+If ``true``, the user will be able to select multiple options (as opposed
+to choosing just one option). Depending on the value of the ``expanded``
+option, this will render either a select tag or checkboxes if ``true`` and
+a select tag or radio buttons if ``false``. The returned value will be a
+Doctrine's Array Collection.
 
 .. note::