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

Trivial merge