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)
commit7b614380f307cb5e27f2a05281bc76c4ace93334
treed243b069a134233f4b98e35769193a1244fc57f8
parent16a9d8617b2d2092d166a85ada4349601afb0dce
parent39023ed6e29103a85bfad505506fa0dbf4dc1112
Merge branch 'master' into branch-1.8