Merge branch 'master' into stable
authorMolly de Blanc <molly@fsf.org>
Sat, 23 Mar 2019 13:10:04 +0000 (09:10 -0400)
committerMolly de Blanc <molly@fsf.org>
Sat, 23 Mar 2019 13:10:04 +0000 (09:10 -0400)

Trivial merge