Enforce locales
Merge branch 'enforce-locales'
Merge branch 'master' into api