Merge branch '3.2'

Author: robbieaverill

client/dist/js/main.bundle.js

@@ -321,15 +321,15 @@ public function getCMSFields()
             // )->setTitle('Post Options');
             // $options->setName('blog-admin-sidebar');
             // $fields->insertBefore($options, 'Root');
+
+            $fields->fieldByName('Root.PostOptions')
+                ->setTitle(_t(__CLASS__ . '.PostOptions', 'Post Options'));
         });
 
         $fields = parent::getCMSFields();
 
         $fields->fieldByName('Root')->setTemplate('TabSet_holder');
 
-        $fields->fieldByName('Root.PostOptions')
-            ->setTitle(_t(__CLASS__ . '.PostOptions', 'Post Options'));
-
         return $fields;
     }