Merge branch 'master' into live
authorMolly de Blanc <molly@fsf.org>
Mon, 4 Jun 2018 20:53:42 +0000 (16:53 -0400)
committerMolly de Blanc <molly@fsf.org>
Mon, 4 Jun 2018 20:53:42 +0000 (16:53 -0400)

Trivial merge