Merge branch '4.5' into 5.0

code/Model/EditableFormField/EditableMemberListField.php

@@ -54,8 +54,10 @@ class EditableMemberListField extends EditableFormField
         }
 
         $members = Member::map_in_groups($this->GroupID);
+
         $field = DropdownField::create($this->Name, $this->EscapedTitle, $members);
         $this->doUpdateFormField($field);
+
         return $field;
     }
 

code/UserForm.php

@@ -196,7 +196,7 @@ trait UserForm
                 $editor = HTMLEditorField::create(
                     'OnCompleteMessage',
                     '',
-                    _t(__CLASS__.'.ONCOMPLETEMESSAGE', $this->OnCompleteMessage)
+                    $this->OnCompleteMessage
                 )
             );