Merge branch 'stable'
authorAndrew Engelbrecht <andrew@fsf.org>
Fri, 15 Mar 2019 19:44:53 +0000 (15:44 -0400)
committerAndrew Engelbrecht <andrew@fsf.org>
Fri, 15 Mar 2019 19:44:53 +0000 (15:44 -0400)

Trivial merge