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

Trivial merge