Merge branch 'master' into stable
authorIan Kelling <iank@fsf.org>
Tue, 19 Mar 2019 16:06:14 +0000 (12:06 -0400)
committerIan Kelling <iank@fsf.org>
Tue, 19 Mar 2019 16:06:14 +0000 (12:06 -0400)

Trivial merge