Fix failing test
Merge remote-tracking branch 'origin/master' into i18n
Remove debugging code
Merge remote-tracking branch 'origin/master' into i18n
I18n: correct handling for unexisting pluralized translations added