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/Storage/Part.php

@@ -198,7 +198,7 @@ protected function _cacheContent()
         }
         $counter = 1;
         foreach ($parts as $part) {
-            $this->parts[$counter++] = new self(array('headers' => $part['header'], 'content' => $part['body']));
+            $this->parts[$counter++] = new static(array('headers' => $part['header'], 'content' => $part['body']));
         }
     }
 

src/Storage/Part/File.php

@@ -155,7 +155,7 @@ public function getPart($num)
             throw new Exception\RuntimeException('part not found');
         }
 
-        return new self(array('file' => $this->fh, 'startPos' => $this->partPos[$num][0],
+        return new static(array('file' => $this->fh, 'startPos' => $this->partPos[$num][0],
                               'endPos' => $this->partPos[$num][1]));
     }
 }