Merge branch 'master' into stable
authorMolly de Blanc <molly@fsf.org>
Tue, 9 Jan 2018 19:14:34 +0000 (14:14 -0500)
committerMolly de Blanc <molly@fsf.org>
Tue, 9 Jan 2018 19:14:34 +0000 (14:14 -0500)

Trivial merge