Merge branch 'master' into branch-1.8
authorBdale Garbee <bdale@gag.com>
Sun, 18 Mar 2018 21:47:31 +0000 (15:47 -0600)
committerBdale Garbee <bdale@gag.com>
Sun, 18 Mar 2018 21:47:31 +0000 (15:47 -0600)

Trivial merge