Merge branch 'master' into stable
authorDana Morgenstein <danam@freestation11.office.fsf.org>
Tue, 19 Mar 2019 16:03:26 +0000 (12:03 -0400)
committerDana Morgenstein <danam@freestation11.office.fsf.org>
Tue, 19 Mar 2019 16:03:26 +0000 (12:03 -0400)

Trivial merge