Merge branch 'i18n-core-scopes' into master