Merge branch 'locales'

No match.