Merge branch 'master' into branch-1.8
authorBdale Garbee <bdale@gag.com>
Mon, 8 Oct 2018 23:49:47 +0000 (17:49 -0600)
committerBdale Garbee <bdale@gag.com>
Mon, 8 Oct 2018 23:49:47 +0000 (17:49 -0600)

Trivial merge