Merge remote-tracking branch 'origin/master'

* origin/master:
  Update CHANGELOG.md
  Update CHANGELOG.md
  Allow setting permissions as children to roles
  Allow setting permission as children to roles

src/User/Helper/AuthHelper.php

@@ -99,7 +99,8 @@ class AuthHelper
     public function getUnassignedItems(AbstractAuthItem $model)
     {
         $excludeItems = $model->item !== null ? [$model->item->name] : [];
-        $items = $this->getAuthManager()->getItems($model->getType(), $excludeItems);
+        $type = $model->getType() == Permission::TYPE_PERMISSION ?: null;
+        $items = $this->getAuthManager()->getItems($type, $excludeItems);
 
         return ArrayHelper::map(
             $items,