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

Author: weierophinney

src/Client/Cookies.php

@@ -337,7 +337,7 @@ protected function _matchPath($domains, $path)
      */
     public static function fromResponse(Response $response, $ref_uri)
     {
-        $jar = new self();
+        $jar = new static();
         $jar->addCookiesFromResponse($response, $ref_uri);
         return $jar;
     }

src/Cookies.php

@@ -343,7 +343,7 @@ protected function _matchPath($domains, $path)
      */
     public static function fromResponse(Response $response, $ref_uri)
     {
-        $jar = new self();
+        $jar = new static();
         $jar->addCookiesFromResponse($response, $ref_uri);
         return $jar;
     }