Merge branch '1.x-maintenance'

diff --cc CHANGES
index cf35f3e431278b35c8edf45ce24195382a978b80,8b93fd200b0d24ecda3d105f5b8f307ea4360021..7dbaf25cc10f167e1c0987ab35f1df8ff4950166
--- 1/CHANGES
--- 2/CHANGES
+++ b/CHANGES
@@@ -1,11 -1,16 +1,21 @@@
  Babel Changelog
  ===============
  
 +Version 2.0
 +-----------
 +
 +(release date to be decided, codename to be selected)
 +
+ Version 1.4
+ -----------
+ 
+ (bugfix release, release date to be decided)
+ 
+ - Fixed a bug that caused deprecated territory codes not being
+   converted properly by the subtag resolving.  This for instance
+   showed up when trying to use ``und_UK`` as a language code
+   which now properly resolves to ``en_GB``.
+ 
  Version 1.3
  -----------