Merge branch 'master' into 3.x-dev

Conflicts:
	core/Version.php
	tests/UI/expected-ui-screenshots
	tests/lib/screenshot-testing/support/chai-extras.js

2 files changed, 3 insertions, 1 deletions

diff --git a/libs/Zend/Validate/Hostname.php b/libs/Zend/Validate/Hostname.php
index 49e72dd1aa..1ca10faea9 100644
--- a/libs/Zend/Validate/Hostname.php
+++ b/libs/Zend/Validate/Hostname.php
@@ -489,6 +489,8 @@ class Zend_Validate_Hostname extends Zend_Validate_Abstract
         'فلسطين' => array(1 => self::VALID_UNICODE_DOMAIN),
         '政务' => array(1 => self::VALID_UNICODE_DOMAIN),
         '家電' => array(1 => self::VALID_UNICODE_DOMAIN),
+        '微博' => array(1 => self::VALID_UNICODE_DOMAIN),
+        'ابوظبي' => array(1 => self::VALID_UNICODE_DOMAIN),
     );
 
 
diff --git a/libs/jqplot/jqplot.core.js b/libs/jqplot/jqplot.core.js
index 0c2d857bdd..8b6ca680f6 100644
--- a/libs/jqplot/jqplot.core.js
+++ b/libs/jqplot/jqplot.core.js
@@ -1804,7 +1804,7 @@
         // prop: drawIfHidden
         // True to execute the draw method even if the plot target is hidden.
         // Generally, this should be false.  Most plot elements will not be sized/
-        // positioned correclty if renderered into a hidden container.  To render into
+        // positioned correctly if renderered into a hidden container.  To render into
         // a hidden container, call the replot method when the container is shown.
         this.drawIfHidden = false;
         this.eventCanvas = new $.jqplot.GenericCanvas();