Merge branch 'master' into stable
authorMolly de Blanc <molly@fsf.org>
Tue, 19 Mar 2019 15:16:12 +0000 (11:16 -0400)
committerMolly de Blanc <molly@fsf.org>
Tue, 19 Mar 2019 15:16:12 +0000 (11:16 -0400)

Trivial merge