Merged updates from localeapp.