Merge remote-tracking branch 'origin/MAGETWO-49827' into develop

app/code/Magento/Wishlist/view/frontend/templates/addto.phtml

@@ -7,8 +7,8 @@
 <script type="text/x-magento-init">
     {
         "body": {
-            "addToWishlist": <?php
-                echo $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getWishlistOptions());
+            "addToWishlist": <?php /* @noEscape */ echo $this->helper('Magento\Framework\Json\Helper\Data')
+                ->jsonEncode($block->getWishlistOptions());
             ?>
         }
     }