Merge branch 'master' into branch-1.8
authorBdale Garbee <bdale@gag.com>
Tue, 9 Oct 2018 02:58:43 +0000 (20:58 -0600)
committerBdale Garbee <bdale@gag.com>
Tue, 9 Oct 2018 02:58:43 +0000 (20:58 -0600)

Trivial merge