Merge branch 'master' into fsf-master
authorAndrew Engelbrecht <andrew@fsf.org>
Mon, 13 Jan 2020 20:20:23 +0000 (15:20 -0500)
committerAndrew Engelbrecht <andrew@fsf.org>
Mon, 13 Jan 2020 20:20:23 +0000 (15:20 -0500)

Trivial merge