Merge branch 'master' into fsf-master
authorAndrew Engelbrecht <andrew@fsf.org>
Thu, 3 Oct 2019 14:40:19 +0000 (10:40 -0400)
committerAndrew Engelbrecht <andrew@fsf.org>
Thu, 3 Oct 2019 14:40:19 +0000 (10:40 -0400)

Trivial merge