Merge branch 'hotfix/3307' into develop

Forward port zendframework/zendframework#3307

Conflicts:
	library/Zend/Code/Generator/DocBlock/Tag/LicenseTag.php
	library/Zend/Code/Generator/DocBlock/Tag/ParamTag.php
	library/Zend/Code/Generator/DocBlock/Tag/ReturnTag.php

src/Config.php

@@ -71,7 +71,7 @@ public function __construct(array $array, $allowModifications = false)
 
         foreach ($array as $key => $value) {
             if (is_array($value)) {
-                $this->data[$key] = new self($value, $this->allowModifications);
+                $this->data[$key] = new static($value, $this->allowModifications);
             } else {
                 $this->data[$key] = $value;
             }
@@ -123,7 +123,7 @@ public function __set($name, $value)
         if ($this->allowModifications) {
 
             if (is_array($value)) {
-                $value = new self($value, true);
+                $value = new static($value, true);
             }
 
             if (null === $name) {
@@ -354,14 +354,14 @@ public function merge(self $merge)
                     $this->data[$key]->merge($value);
                 } else {
                     if ($value instanceof self) {
-                        $this->data[$key] = new self($value->toArray(), $this->allowModifications);
+                        $this->data[$key] = new static($value->toArray(), $this->allowModifications);
                     } else {
                         $this->data[$key] = $value;
                     }
                 }
             } else {
                 if ($value instanceof self) {
-                    $this->data[$key] = new self($value->toArray(), $this->allowModifications);
+                    $this->data[$key] = new static($value->toArray(), $this->allowModifications);
                 } else {
                     $this->data[$key] = $value;
                 }