Merge branch '3.1'

composer.json

@@ -15,7 +15,7 @@
         "silverstripe/asset-admin": "^1.0"
     },
     "require-dev": {
-        "phpunit/PHPUnit": "^5.7",
+        "phpunit/phpunit": "^5.7",
         "squizlabs/php_codesniffer": "^3.0"
     },
     "extra": {

src/Model/BlogPost.php

@@ -248,14 +248,6 @@ class BlogPost extends Page
 
             $fields->insertAfter('FeaturedImage', $summaryHolder);
 
-            $urlSegment = $fields->dataFieldByName('URLSegment');
-            $urlSegment->setURLPrefix($this->Parent()->RelativeLink());
-
-            $fields->removeFieldsFromTab('Root.Main', [
-                'MenuTitle',
-                'URLSegment',
-            ]);
-
             $authorField = ListboxField::create(
                 'Authors',
                 _t(__CLASS__ . '.Authors', 'Authors'),
@@ -306,7 +298,6 @@ class BlogPost extends Page
                 'Root.PostOptions',
                 [
                     $publishDate,
-                    $urlSegment,
                     TagField::create(
                         'Categories',
                         _t(__CLASS__ . '.Categories', 'Categories'),