l10n fix - index is not inject to basis.l10n module
Merge remote-tracking branch 'origin/master' into app-control-panel