Merge branch 'master' into stable
authorMolly de Blanc <molly@fsf.org>
Thu, 23 Aug 2018 15:03:58 +0000 (11:03 -0400)
committerMolly de Blanc <molly@fsf.org>
Thu, 23 Aug 2018 15:03:58 +0000 (11:03 -0400)

Trivial merge