diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 4edb447c7ac..ca48fed9bbe 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -7,6 +7,7 @@
 * Fix - SKUs prop on products shortcode.
 * Fix - Layered nav counts when term_id does not match term_taxonomy_id (before splitting).
 * Fix - Fixed referer links from cart messages in WP 4.4.
+* Fix - Fix the showing/hiding of panels when terms do not exist by using wc_get_product_types() for retrieving product types.
 * Dev - content-product.php and content-product_cat.php contained the wrong version.
 * Dev - Show "matching zone" notice on the frontend when shipping debug mode is on.
 * Dev - Restored missing WC_Settings_API::init_form_fields() method to prevent potential errors in 3rd party gateways.
@@ -17,6 +18,7 @@
 * Tweak - If shipping method count changes, reset to default.
 * Tweak - Avoid normalization of zone postcodes so wildcard matching can be performed on postcodes with spaces. E.g. SP1 *
 * Tweak - Allow max_fee in addition to min_fee in flat rate costs fields.
+* Tweak - Wrap order_schema_markup() output in hidden div in case script tag is stripped.
 
 = 2.6.0 - 14/06/16 =
 * Feature - Introduced Shipping Zone functionality, and re-usable instance based shipping methods.
diff --git a/includes/class-wc-emails.php b/includes/class-wc-emails.php
index 5b074850524..567bb755053 100644
--- a/includes/class-wc-emails.php
+++ b/includes/class-wc-emails.php
@@ -373,7 +373,7 @@ class WC_Emails {
 
 		$markup = apply_filters( 'woocommerce_email_order_schema_markup', $markup, $sent_to_admin, $order );
 
-		echo '<script type="application/ld+json">' . wp_json_encode( (object) $markup ) . '</script>';
+		echo '<div style="display:none;"><script type="application/ld+json">' . wp_json_encode( (object) $markup ) . '</script></div>';
 	}
 
 	/**
diff --git a/readme.txt b/readme.txt
index 57379b9c12b..dd90e91341d 100644
--- a/readme.txt
+++ b/readme.txt
@@ -176,6 +176,7 @@ Yes you can! Join in on our [GitHub repository](http://github.com/woothemes/wooc
 * Tweak - If shipping method count changes, reset to default.
 * Tweak - Avoid normalization of zone postcodes so wildcard matching can be performed on postcodes with spaces. E.g. SP1 *
 * Tweak - Allow max_fee in addition to min_fee in flat rate costs fields.
+* Tweak - Wrap order_schema_markup() output in hidden div in case script tag is stripped.
 
 = 2.6.0 - 14/06/16 =
 * Feature - Introduced Shipping Zone functionality, and re-usable instance based shipping methods.