Merge branch 'master' into stable
authorIan Kelling <iank@fsf.org>
Thu, 14 Mar 2019 00:49:55 +0000 (20:49 -0400)
committerIan Kelling <iank@fsf.org>
Thu, 14 Mar 2019 00:49:55 +0000 (20:49 -0400)

Trivial merge