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

Trivial merge