Merge branch 'release/2.3.2' into develop
Fix encoding bug introduced with previous version
Sync i18n with cucumber
Update changelog
Merge branch 'release/2.3.3'