Merge branch 'master' into fsf-master
authorAndrew Engelbrecht <andrew@fsf.org>
Thu, 10 Oct 2019 15:07:35 +0000 (11:07 -0400)
committerAndrew Engelbrecht <andrew@fsf.org>
Thu, 10 Oct 2019 15:07:35 +0000 (11:07 -0400)

Trivial merge