Fix #485: sort localized country names alphabetically
Merged countries sort
Merge branch 'pr/488'