Merge branch 'master' into stable
authorMolly de Blanc <molly@fsf.org>
Wed, 22 Aug 2018 14:46:53 +0000 (10:46 -0400)
committerMolly de Blanc <molly@fsf.org>
Wed, 22 Aug 2018 14:46:53 +0000 (10:46 -0400)

Trivial merge