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

Trivial merge