Merge branch 'master' into stable
authorMolly de Blanc <molly@fsf.org>
Mon, 13 Aug 2018 21:26:37 +0000 (17:26 -0400)
committerMolly de Blanc <molly@fsf.org>
Mon, 13 Aug 2018 21:26:37 +0000 (17:26 -0400)

Trivial merge