Merge branch 'master' into branch-1.8
authorBdale Garbee <bdale@gag.com>
Tue, 12 Dec 2017 04:37:48 +0000 (21:37 -0700)
committerBdale Garbee <bdale@gag.com>
Tue, 12 Dec 2017 04:37:48 +0000 (21:37 -0700)

Trivial merge