Merge branch 'stable'
authorzoe1 <zoe@fsf.org>
Fri, 12 Mar 2021 20:39:36 +0000 (21:39 +0100)
committerzoe1 <zoe@fsf.org>
Fri, 12 Mar 2021 20:39:36 +0000 (21:39 +0100)

Trivial merge