uses 1.8 hash syntax
Merge branch 'refs/heads/1884-renamed-resource-i18n'