Merge branch 'master' into stable
authorDana Morgenstein <danam@freestation11.office.fsf.org>
Mon, 17 Dec 2018 20:35:58 +0000 (15:35 -0500)
committerDana Morgenstein <danam@freestation11.office.fsf.org>
Mon, 17 Dec 2018 20:35:58 +0000 (15:35 -0500)

Trivial merge