Merge branch 'master' into branch-1.8
authorBdale Garbee <bdale@gag.com>
Tue, 12 Dec 2017 04:37:48 +0000 (21:37 -0700)
committerBdale Garbee <bdale@gag.com>
Tue, 12 Dec 2017 04:37:48 +0000 (21:37 -0700)
commitea0aa97fb93e669868a6f2c49c5d4b46e7615b1f
treef16b9a9ccd8b4a7bcde7d5cc64e6f0a52c4f3436
parent216ea6388a75c46891dc4687a2eb0c97dc63b136
parent9adf8b23aac8256f230b10adcab9dd323266caaa
Merge branch 'master' into branch-1.8