Enforce locales
Merge branch 'enforce-locales'