Tweaked vapour to correct race i18n situation, and Boolean
Merge pull request #3238 from masterbee/hotfix-vapour

Tweaked vapour to correct race i18n situation, and Boolean