Merge branch 'master' into branch-1.9 1.9
authorBdale Garbee <bdale@gag.com>
Thu, 3 Jan 2019 06:03:41 +0000 (23:03 -0700)
committerBdale Garbee <bdale@gag.com>
Thu, 3 Jan 2019 06:03:41 +0000 (23:03 -0700)

Trivial merge