Moving the code that sets the TranslatableListener locale.
Merge remote-tracking branch 'origin/develop' into feature/api-65-i18n