silence i18n deprecation warnings.  Some day, we may flip this to true.
Merge branch 'staging' into production