Merge branch '2.7' into 2.8

xabbuh · xabbuh · commit 172b72bfec1b · 2016-01-06T19:01:32.000+01:00
diff --git a/reference/forms/types/options/choice_label.rst.inc b/reference/forms/types/options/choice_label.rst.inc
@@ -49,7 +49,7 @@ If your choice values are objects, then ``choice_label`` can also be a
         'choices' => array(
             new Status(Status::YES),
             new Status(Status::NO),
-            new Status::(Status::MAYBE),
+            new Status(Status::MAYBE),
         ),
         'choices_as_values' => true,
         'choice_label' => 'displayName',
