Merge branch 'master' into branch-1.8
authorBdale Garbee <bdale@gag.com>
Fri, 22 Dec 2017 02:05:46 +0000 (19:05 -0700)
committerBdale Garbee <bdale@gag.com>
Fri, 22 Dec 2017 02:05:46 +0000 (19:05 -0700)

Trivial merge