Comment 1 for bug 1939544

The merge was easy, as most of the diff in the upstream release comes from patches that we already applied.

A build was uploaded to the following PPA:
https://launchpad.net/~schopin/+archive/ubuntu/test-ppa/+sourcepub/12642810/+listing-archive-extra

Attached is a debdiff from the Ubuntu version, a debdiff against the current Debian version will follow shortly for reference.