Merge branch 'stable'
authorAndrew Engelbrecht <andrew@fsf.org>
Fri, 15 Mar 2019 20:10:07 +0000 (16:10 -0400)
committerAndrew Engelbrecht <andrew@fsf.org>
Fri, 15 Mar 2019 20:10:07 +0000 (16:10 -0400)

Trivial merge