Merge branch 'master' into fsf-master
authorAndrew Engelbrecht <andrew@fsf.org>
Wed, 14 Aug 2019 14:29:15 +0000 (10:29 -0400)
committerAndrew Engelbrecht <andrew@fsf.org>
Wed, 14 Aug 2019 14:29:15 +0000 (10:29 -0400)

Trivial merge