Merge branch 'master' into stable
authorMolly de Blanc <molly@fsf.org>
Thu, 14 Mar 2019 17:49:15 +0000 (13:49 -0400)
committerMolly de Blanc <molly@fsf.org>
Thu, 14 Mar 2019 17:49:15 +0000 (13:49 -0400)

Trivial merge