Merge branch 'master' into stable
authorMolly de Blanc <molly@fsf.org>
Sun, 17 Mar 2019 12:03:11 +0000 (08:03 -0400)
committerMolly de Blanc <molly@fsf.org>
Sun, 17 Mar 2019 12:03:11 +0000 (08:03 -0400)

Trivial merge