Merge branch 'master' into branch-1.9
authorBdale Garbee <bdale@gag.com>
Fri, 6 Dec 2019 05:21:29 +0000 (22:21 -0700)
committerBdale Garbee <bdale@gag.com>
Fri, 6 Dec 2019 05:21:29 +0000 (22:21 -0700)

Trivial merge