Merge branch 'master' into live
authorMolly de Blanc <molly@fsf.org>
Thu, 7 Jun 2018 19:37:08 +0000 (15:37 -0400)
committerMolly de Blanc <molly@fsf.org>
Thu, 7 Jun 2018 19:37:08 +0000 (15:37 -0400)

Trivial merge