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

Trivial merge