Clean up an i18n deprecation warning
Merge branch 'refs/heads/master' into template_import

* refs/heads/master:
  Clean up an i18n deprecation warning