Merge remote-tracking branch 'github/develop' into publication

app/code/Magento/PageCache/etc/varnish.vcl

@@ -46,6 +46,18 @@ sub vcl_recv {
     if (req.request != "GET" && req.request != "HEAD") {
         return (pass);
     }
+    
+    # normalize url in case of leading HTTP scheme and domain
+    set req.url = regsub(req.url, "^http[s]?://[^/]+", "");
+
+    # collect all cookies
+    std.collect(req.http.Cookie);
+
+    # static files are always cacheable. remove SSL flag and cookie
+    if (req.url ~ "^/(pub/)?(media|static)/.*\.(png|jpg|jpeg|gif|css|js|swf|ico|woff|svg)$") {
+        unset req.http.Https;
+        unset req.http.Cookie;
+    }
 
     set req.grace = 1m;
 

dev/tests/integration/testsuite/Magento/Framework/Code/_expected/SourceClassWithNamespaceFactory.php.sample

@@ -2,7 +2,7 @@
 namespace Magento\Framework\Code\GeneratorTest;
 
 /**
- * Factory class for Magento\Framework\Code\GeneratorTest\SourceClassWithNamespace
+ * Factory class for @see \Magento\Framework\Code\GeneratorTest\SourceClassWithNamespace
  *
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.

dev/tests/integration/testsuite/Magento/Framework/Code/_expected/SourceClassWithNamespaceProxy.php.sample

@@ -2,7 +2,7 @@
 namespace Magento\Framework\Code\GeneratorTest\SourceClassWithNamespace;
 
 /**
- * Proxy class for Magento\Framework\Code\GeneratorTest\SourceClassWithNamespace
+ * Proxy class for @see \Magento\Framework\Code\GeneratorTest\SourceClassWithNamespace
  *
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.

dev/tests/unit/testsuite/Magento/Framework/Api/Code/Generator/_files/SampleBuilder.txt

 namespace \Magento\Framework\Api\Code\Generator;
 
 /**
- * Builder class for \Magento\Framework\Api\Code\Generator\Sample
+ * Builder class for @see \Magento\Framework\Api\Code\Generator\Sample
  */
 class SampleBuilder extends \Magento\Framework\Api\ExtensibleObjectBuilder
 {

dev/tests/unit/testsuite/Magento/Framework/Api/Code/Generator/_files/SampleMapper.txt

 namespace \Magento\Framework\Api\Code\Generator;
 
 /**
- * Mapper class for \Magento\Framework\Api\Code\Generator\Sample
+ * Mapper class for @see \Magento\Framework\Api\Code\Generator\Sample
  */
 class SampleMapper
 {

dev/tests/unit/testsuite/Magento/Framework/Api/Code/Generator/_files/SampleSearchResultsBuilder.txt

 namespace \Magento\Framework\Api\Code\Generator;
 
 /**
- * SearchResultsBuilder class for \Magento\Framework\Api\Code\Generator\Sample
+ * SearchResultsBuilder class for @see \Magento\Framework\Api\Code\Generator\Sample
  */
 class SampleSearchResultsBuilder extends \Magento\Framework\Api\AbstractSearchResultsBuilder
 {

dev/tests/unit/testsuite/Magento/Framework/ObjectManager/Code/Generator/_files/SampleFactory.txt

 namespace \Magento\Framework\ObjectManager\Code\Generator;
 
 /**
- * Factory class for \Magento\Framework\ObjectManager\Code\Generator\Sample
+ * Factory class for @see \Magento\Framework\ObjectManager\Code\Generator\Sample
  */
 class SampleFactory
 {

dev/tests/unit/testsuite/Magento/Framework/ObjectManager/Code/Generator/_files/SampleProxy.txt

 namespace \Magento\Framework\ObjectManager\Code\Generator;
 
 /**
- * Proxy class for \Magento\Framework\ObjectManager\Code\Generator\Sample
+ * Proxy class for @see \Magento\Framework\ObjectManager\Code\Generator\Sample
  */
 class Sample_Proxy extends \Magento\Framework\ObjectManager\Code\Generator\Sample
 {

lib/internal/Magento/Framework/Code/Generator/EntityAbstract.php

@@ -291,7 +291,7 @@ abstract class EntityAbstract
      */
     protected function _getClassDocBlock()
     {
-        $description = ucfirst(static::ENTITY_TYPE) . ' class for \\' . $this->_getSourceClassName();
+        $description = ucfirst(static::ENTITY_TYPE) . ' class for @see \\' . $this->_getSourceClassName();
         return ['shortDescription' => $description];
     }