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)
commitdbb78c8222c45f4430601deee0194b0c9dc2e79a
tree6805b815727c58ad6c01f9163e42ab3177ee56d5
parentfe38c22595b050435dbacd35f1baae064fb7de75
parent87aab99521dc44d1d29fbb0b7f227f868f074836
Merge branch 'master' into branch-1.8