Merge remote-tracking branch 'origin/master'

includes/wc-template-hooks.php

@@ -192,6 +192,13 @@ add_action( 'woocommerce_after_shop_loop', 'woocommerce_pagination', 10 );
 add_filter( 'woocommerce_product_tabs', 'woocommerce_default_product_tabs' );
 add_filter( 'woocommerce_product_tabs', 'woocommerce_sort_product_tabs', 99 );
 
+/**
+ * Additional Information tab.
+ *
+ * @see wc_display_product_attributes()
+ */
+add_action( 'woocommerce_product_additional_information', 'wc_display_product_attributes', 10 );
+
 /**
  * Photoswipe.
  */

templates/single-product/tabs/additional-information.php

@@ -30,4 +30,4 @@ $heading = esc_html( apply_filters( 'woocommerce_product_additional_information_
 	<h2><?php echo $heading; ?></h2>
 <?php endif; ?>
 
-<?php wc_display_product_attributes( $product ); ?>
+<?php do_action( 'woocommerce_product_additional_information', $product ); ?>