bug#80239: Request for merging "next-master" branch

[Andreas Enge]

Hello,

so far there is only one new commit on the crypto-team branch, but I am
already lining it up in the queue. Right now it is based on next-master.

Andreas