Merge branch 'live' of vcs.fsf.org:enc-live into live
authorZoe <zoe@fsf.org>
Mon, 28 Oct 2019 14:56:14 +0000 (10:56 -0400)
committerZoe <zoe@fsf.org>
Mon, 28 Oct 2019 14:56:14 +0000 (10:56 -0400)

Trivial merge