Merge branch 'master' into fsf-master
authorAndrew Engelbrecht <andrew@fsf.org>
Fri, 20 Sep 2019 14:26:40 +0000 (10:26 -0400)
committerAndrew Engelbrecht <andrew@fsf.org>
Fri, 20 Sep 2019 14:26:40 +0000 (10:26 -0400)

Trivial merge