bug#81143: Request for merging "crypto-team" branch

[Andreas Enge]

QA had not yet picked up this issue, so I have just created a duplicate,
which I am closing. After the r-team merge, I am rebasing and will push
shortly.

Andreas