Merge branch 'master' into stable
authorMolly de Blanc <molly@fsf.org>
Fri, 17 Aug 2018 14:43:29 +0000 (10:43 -0400)
committerMolly de Blanc <molly@fsf.org>
Fri, 17 Aug 2018 14:43:29 +0000 (10:43 -0400)

Trivial merge