Merge branch 'master' into orders-crud-classes

i18n/countries.php

@@ -171,7 +171,6 @@ return array(
 	'NR' => __( 'Nauru', 'woocommerce' ),
 	'NP' => __( 'Nepal', 'woocommerce' ),
 	'NL' => __( 'Netherlands', 'woocommerce' ),
-	'AN' => __( 'Netherlands Antilles', 'woocommerce' ),
 	'NC' => __( 'New Caledonia', 'woocommerce' ),
 	'NZ' => __( 'New Zealand', 'woocommerce' ),
 	'NI' => __( 'Nicaragua', 'woocommerce' ),

includes/abstracts/abstract-wc-product.php

@@ -632,7 +632,7 @@ class WC_Product {
 	 * @return bool
 	 */
 	public function backorders_allowed() {
-		return apply_filters( 'woocommerce_product_backorders_allowed', $this->backorders === 'yes' || $this->backorders === 'notify' ? true : false, $this->id );
+		return apply_filters( 'woocommerce_product_backorders_allowed', $this->backorders === 'yes' || $this->backorders === 'notify' ? true : false, $this->id, $this );
 	}
 
 	/**

includes/admin/class-wc-admin-meta-boxes.php

@@ -64,9 +64,6 @@ class WC_Admin_Meta_Boxes {
 		// Save Coupon Meta Boxes
 		add_action( 'woocommerce_process_shop_coupon_meta', 'WC_Meta_Box_Coupon_Data::save', 10, 2 );
 
-		// Save Rating Meta Boxes
-		add_action( 'comment_edit_redirect', 'WC_Meta_Box_Order_Reviews::save', 1, 2 );
-
 		// Error handling (for showing errors from meta boxes on next page load)
 		add_action( 'admin_notices', array( $this, 'output_errors' ) );
 		add_action( 'shutdown', array( $this, 'save_errors' ) );

readme.txt

@@ -170,6 +170,7 @@ Yes you can! Join in on our [GitHub repository](http://github.com/woothemes/wooc
 * Fix - Javascript show/hide of option in free shipping method.
 * Fix - Convert ellipsis to three periods when saving postcodes.
 * Fix - Prevent get_terms returning duplicates.
+* Fix - Removed non-existent country (Netherlands Antilles) from https://en.wikipedia.org/wiki/ISO_3166-1.
 * Tweak - Made customer pay link display if order needs_payment() rather than checking pending status.
 * Tweak - Zones - Wording clarifications.
 * Tweak - Zones - Match zones with postcodes but no country.