Merge branch '1.x-maintenance'

diff --cc CHANGES
index 08bbe2a95e3e4546dcb062231cfd5cb2061d595d,13f1ad8a63460ee45866978f55ecd3f53bd2ec84..66202f2dd55f546249d0ce26412974ba9eb7fc85
--- 1/CHANGES
--- 2/CHANGES
+++ b/CHANGES
@@@ -1,11 -1,15 +1,20 @@@
  Babel Changelog
  ===============
  
 +Version 2.0
 +-----------
 +
 +(release date to be decided, codename to be selected)
 +
+ Version 1.3
+ -----------
+ 
+ (bugfix release, release date to be decided)
+ 
+ - Fixed a bug in likely-subtag resolving for some common locales.
+   This primarily makes ``zh_CN`` work again which was broken
+   due to how it was defined in the likely subtags combined with
+   our broken resolving.  This fixes #37.
  
  Version 1.2
  -----------