Merge branch 'stable'
authorzoe1 <zoe@fsf.org>
Sat, 25 Sep 2021 00:33:15 +0000 (02:33 +0200)
committerzoe1 <zoe@fsf.org>
Sat, 25 Sep 2021 00:33:15 +0000 (02:33 +0200)

Trivial merge