Merge branch 'master' into branch-1.9
authorBdale Garbee <bdale@gag.com>
Thu, 22 Oct 2020 22:17:33 +0000 (16:17 -0600)
committerBdale Garbee <bdale@gag.com>
Thu, 22 Oct 2020 22:17:33 +0000 (16:17 -0600)

Trivial merge