Merge branch 'master' into branch-1.8
authorBdale Garbee <bdale@gag.com>
Mon, 8 Oct 2018 23:49:47 +0000 (17:49 -0600)
committerBdale Garbee <bdale@gag.com>
Mon, 8 Oct 2018 23:49:47 +0000 (17:49 -0600)
commit34658a1236e34891b41a0a51a480717db98779e7
tree1e29cdc000c50e4f01e5c54aa69befd8e6919524
parent3a2a5a05bb6372d9003905cee7afdfcd6d38ae7e
parent88ae4c5ebd64215f05f5efc18f9660560b409ace
Merge branch 'master' into branch-1.8