Merge branch 'master' into fsf-master
authorAndrew Engelbrecht <andrew@fsf.org>
Mon, 16 Dec 2019 16:29:25 +0000 (11:29 -0500)
committerAndrew Engelbrecht <andrew@fsf.org>
Mon, 16 Dec 2019 16:29:25 +0000 (11:29 -0500)

Trivial merge