Merge branch 'master' into fsf-master
authorAndrew Engelbrecht <andrew@fsf.org>
Wed, 30 Oct 2019 16:47:40 +0000 (12:47 -0400)
committerAndrew Engelbrecht <andrew@fsf.org>
Wed, 30 Oct 2019 16:47:40 +0000 (12:47 -0400)

Trivial merge