Bastion: moving i18n filter and adding tests.
Merge pull request #2481 from waldenraines/bastion

Bastion: moving i18n filter and adding tests.