Merge proposals dependent on lp:~yann-papouin/ocb-server/6.1-bug-1049653-translatable-unaccent

1. 6.1-bug-1049653-translatable-unaccent
2. Dependent merge proposals