Merge branch 'template_locales'