fix ordering of CLDR names
Merge branch 'master' into py2