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

Trivial merge