Merge branch 'master' into stable
authorMolly de Blanc <molly@fsf.org>
Thu, 21 Dec 2017 21:43:19 +0000 (16:43 -0500)
committerMolly de Blanc <molly@fsf.org>
Thu, 21 Dec 2017 21:43:19 +0000 (16:43 -0500)

Trivial merge