Merge branch 'master' of vcs.fsf.org:enc
authorMolly de Blanc <molly@fsf.org>
Thu, 7 Jun 2018 19:31:56 +0000 (15:31 -0400)
committerMolly de Blanc <molly@fsf.org>
Thu, 7 Jun 2018 19:31:56 +0000 (15:31 -0400)

Trivial merge