Merge branch 'master' into stable
authorMolly de Blanc <molly@fsf.org>
Wed, 10 Jan 2018 15:35:39 +0000 (10:35 -0500)
committerMolly de Blanc <molly@fsf.org>
Wed, 10 Jan 2018 15:35:39 +0000 (10:35 -0500)

Trivial merge