diff --git a/includes/admin/class-wc-admin-taxonomies.php b/includes/admin/class-wc-admin-taxonomies.php
index 65eee936064..4e7a00ef785 100644
--- a/includes/admin/class-wc-admin-taxonomies.php
+++ b/includes/admin/class-wc-admin-taxonomies.php
@@ -290,7 +290,7 @@ class WC_Admin_Taxonomies {
 	 * Description for product_cat page to aid users.
 	 */
 	public function product_cat_description() {
-		echo wpautop( __( 'Product categories for your store can be managed here. To change the order of categories on the front-end you can drag and drop to sort them. To see more categories listed click the "screen options" link at the top of the page.', 'woocommerce' ) );
+		echo wpautop( __( 'Product categories for your store can be managed here. To change the order of categories on the front-end you can drag and drop to sort them. To see more categories listed click the "screen options" link at the top-right of this page.', 'woocommerce' ) );
 	}
 
 	/**
diff --git a/includes/admin/settings/class-wc-settings-checkout.php b/includes/admin/settings/class-wc-settings-checkout.php
index 927058e8299..b7750dc7a26 100644
--- a/includes/admin/settings/class-wc-settings-checkout.php
+++ b/includes/admin/settings/class-wc-settings-checkout.php
@@ -108,7 +108,7 @@ class WC_Settings_Payment_Gateways extends WC_Settings_Page {
 				'type'            => 'checkbox',
 				'checkboxgroup'   => '',
 				'show_if_checked' => 'option',
-				'desc_tip'        => __( 'Force SSL (HTTPS) on the checkout pages (an SSL Certificate is required).', 'woocommerce' ),
+				'desc_tip'        => sprintf( __( 'Force SSL (HTTPS) on the checkout pages (%1$san SSL Certificate is required%2$s).', 'woocommerce' ), '<a href="https://docs.woocommerce.com/document/ssl-and-https/#section-3" target="_blank">', '</a>' )
 			),
 
 			'unforce_ssl_checkout' => array(
diff --git a/includes/admin/views/html-admin-page-addons.php b/includes/admin/views/html-admin-page-addons.php
index 5c2efba0b8b..b0a59b3eb7c 100644
--- a/includes/admin/views/html-admin-page-addons.php
+++ b/includes/admin/views/html-admin-page-addons.php
@@ -42,7 +42,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 			</ul>
 		<?php endif; ?>
 	<?php else : ?>
-		<p><?php printf( __( 'Our catalog of WooCommerce Extensions can be found on WooThemes.com here: <a href="%s">WooCommerce Extensions Catalog</a>', 'woocommerce' ), 'https://woocommerce.com/product-category/woocommerce-extensions/' ); ?></p>
+		<p><?php printf( __( 'Our catalog of WooCommerce Extensions can be found on WooCommerce.com here: <a href="%s">WooCommerce Extensions Catalog</a>', 'woocommerce' ), 'https://woocommerce.com/product-category/woocommerce-extensions/' ); ?></p>
 	<?php endif; ?>
 
 	<?php if ( 'Storefront' !== $theme['Name'] ) : ?>
diff --git a/includes/class-wc-logger.php b/includes/class-wc-logger.php
index e1d9a3aa8d5..fa1050ddb15 100644
--- a/includes/class-wc-logger.php
+++ b/includes/class-wc-logger.php
@@ -53,8 +53,13 @@ class WC_Logger {
 			return true;
 		}
 
-		if ( $this->_handles[ $handle ] = @fopen( wc_get_log_file_path( $handle ), $mode ) ) {
+		if ( ! file_exists( wc_get_log_file_path( $handle ) ) ) {
+			$temphandle = @fopen( wc_get_log_file_path( $handle ), 'w+' );
+			@fclose( $temphandle );
 			@chmod( wc_get_log_file_path( $handle ), FS_CHMOD_FILE );
+		}
+
+		if ( $this->_handles[ $handle ] = @fopen( wc_get_log_file_path( $handle ), $mode ) ) {
 			return true;
 		}
 
diff --git a/includes/class-wc-shipping-zone.php b/includes/class-wc-shipping-zone.php
index 0622b5c876a..fb8f7347c75 100644
--- a/includes/class-wc-shipping-zone.php
+++ b/includes/class-wc-shipping-zone.php
@@ -54,6 +54,14 @@ class WC_Shipping_Zone extends WC_Data {
 		}
 	}
 
+	/**
+	 * Returns all data for this object.
+	 * @return array
+	 */
+	public function get_data() {
+		return array_merge( array( 'id' => $this->get_id(), 'zone_id' => $this->get_id() ), $this->data, array( 'meta_data' => $this->get_meta_data() ) );
+	}
+
 	/**
 	 * Insert zone into the database
 	 */
diff --git a/tests/unit-tests/settings/register-wp-admin-settings.php b/tests/unit-tests/settings/register-wp-admin-settings.php
index 6ba8c321194..42a0d564a80 100644
--- a/tests/unit-tests/settings/register-wp-admin-settings.php
+++ b/tests/unit-tests/settings/register-wp-admin-settings.php
@@ -176,7 +176,7 @@ class WC_Tests_Register_WP_Admin_Settings extends WC_Unit_Test_Case {
 
 	/**
 	 * @since 2.7.0
-	 * @covers WC_Register_WP_Admin_Settings::register_settings
+	 * @covers WC_Register_WP_Admin_Settings::register_page_settings
 	 */
 	public function test_register_settings_one_section() {
 		$this->page
@@ -200,7 +200,7 @@ class WC_Tests_Register_WP_Admin_Settings extends WC_Unit_Test_Case {
 
 	/**
 	 * @since 2.7.0
-	 * @covers WC_Register_WP_Admin_Settings::register_settings
+	 * @covers WC_Register_WP_Admin_Settings::register_page_settings
 	 */
 	public function test_register_settings() {
 		$this->page