Fixing includes for TranslationScopes.
Merge branch 'master' into features/admin-views