Merge branch 'master' into stable
authorMichael McMahon <michael@fsf.org>
Thu, 21 Mar 2019 18:53:48 +0000 (14:53 -0400)
committerMichael McMahon <michael@fsf.org>
Thu, 21 Mar 2019 18:53:48 +0000 (14:53 -0400)

Trivial merge