Bug#922619: Fix proposal

[Frédéric Bonnard]

Updated the merge request, based on upstream discussions and
improvements.

F.

pgpHTQkne7bZs.pgp
Description: PGP signature