Merge branch '4.0'

code/model/editableformfields/EditableFormHeading.php

@@ -59,7 +59,8 @@ class EditableFormHeading extends EditableFormField
 
     public function getFormField()
     {
-        $labelField = new HeaderField($this->Name, $this->EscapedTitle, $this->Level);
+        $labelField = HeaderField::create($this->EscapedTitle)
+            ->setHeadingLevel($this->Level);
         $labelField->addExtraClass('FormHeading');
         $labelField->setAttribute('data-id', $this->Name);
         $this->doUpdateFormField($labelField);

code/model/editableformfields/EditableOption.php

@@ -162,7 +162,8 @@ class EditableOption extends DataObject
         return $value;
     }
 
-    protected function onBeforeWrite() {
+    protected function onBeforeWrite()
+    {
         if (!$this->Sort) {
             $this->Sort = EditableOption::get()->max('Sort') + 1;
         }