Merge branch '3.6' into 3

src/Model/Blog.php

@@ -120,6 +120,8 @@ class Blog extends Page implements PermissionProvider
     ];
 
     /**
+     * The ProvideComments db column is defined in the silverstripe/comments module
+     *
      * @var array
      */
     private static $defaults = [

src/Model/BlogPost.php

@@ -103,6 +103,9 @@ class BlogPost extends Page
     ];
 
     /**
+     * The ProvideComments db column is defined in the silverstripe/comments module
+     * The InheritSideBar db column is defined in the silverstripe/widgets module
+     *
      * @var array
      */
     private static $defaults = [