Merge remote-tracking branch 'origin/4.0' into 4.1

src/ORM/FieldType/DBMultiEnum.php

@@ -11,7 +11,7 @@ use SilverStripe\Forms\CheckboxSetField;
  */
 class DBMultiEnum extends DBEnum
 {
-    public function __construct($name, $enum = null, $default = null)
+    public function __construct($name = null, $enum = null, $default = null)
     {
         // MultiEnum needs to take care of its own defaults
         parent::__construct($name, $enum, null);

templates/SilverStripe/Forms/SelectionGroup.ss

@@ -6,9 +6,9 @@
 			$RadioLabel
 			$FieldHolder
 		</li>
-	</ul>
 	<% end_if %>
 	<% end_loop %>
+	</ul>
 <% else %>
 	<ul class="SelectionGroup<% if extraClass %> $extraClass<% end_if %>">
 	<% loop $FieldSet %>