Merge branch 'master' into branch-1.8
authorBdale Garbee <bdale@gag.com>
Tue, 19 Sep 2017 02:35:00 +0000 (20:35 -0600)
committerBdale Garbee <bdale@gag.com>
Tue, 19 Sep 2017 02:35:00 +0000 (20:35 -0600)

Trivial merge