Merge branch 'master' into stable
authorMolly de Blanc <molly@fsf.org>
Wed, 27 Jun 2018 19:18:42 +0000 (15:18 -0400)
committerMolly de Blanc <molly@fsf.org>
Wed, 27 Jun 2018 19:18:42 +0000 (15:18 -0400)

Trivial merge