Merge branch 'master' into fsf-master
authorAndrew Engelbrecht <andrew@fsf.org>
Fri, 7 Feb 2020 17:22:28 +0000 (12:22 -0500)
committerAndrew Engelbrecht <andrew@fsf.org>
Fri, 7 Feb 2020 17:22:28 +0000 (12:22 -0500)

Trivial merge