Merge branch 'master' into stable
authorDana Morgenstein <danam@freestation11.office.fsf.org>
Tue, 19 Mar 2019 15:53:22 +0000 (11:53 -0400)
committerDana Morgenstein <danam@freestation11.office.fsf.org>
Tue, 19 Mar 2019 15:53:22 +0000 (11:53 -0400)

Trivial merge