Merge branch 'master' into stable
authorDana Morgenstein <danam@freestation11.office.fsf.org>
Fri, 8 Mar 2019 17:12:31 +0000 (12:12 -0500)
committerDana Morgenstein <danam@freestation11.office.fsf.org>
Fri, 8 Mar 2019 17:12:31 +0000 (12:12 -0500)

Trivial merge