Merge branch 'master' into stable
authorMolly de Blanc <molly@fsf.org>
Tue, 16 Jan 2018 17:25:27 +0000 (12:25 -0500)
committerMolly de Blanc <molly@fsf.org>
Tue, 16 Jan 2018 17:25:27 +0000 (12:25 -0500)

Trivial merge