Merge remote-tracking branch 'origin/MAGETWO-47342' into W1

app/code/Magento/Downloadable/Model/Product/Type.php

@@ -178,7 +178,7 @@ class Type extends \Magento\Catalog\Model\Product\Type\Virtual
      */
     public function hasOptions($product)
     {
-        return $product->getLinksPurchasedSeparately() || parent::hasOptions($product);
+        return parent::hasOptions($product) || $this->hasLinks($product);
     }
 
     /**