Unification of several CLDR fixes

Replaces pull requests #88 #89 & #90.