locales
Merge branch 'hotfix/company_locales'

* hotfix/company_locales:
  locales