Merge branch 'master' into branch-1.8
authorBdale Garbee <bdale@gag.com>
Tue, 19 Sep 2017 02:35:00 +0000 (20:35 -0600)
committerBdale Garbee <bdale@gag.com>
Tue, 19 Sep 2017 02:35:00 +0000 (20:35 -0600)
commitb12e982259817328e348f1aaa91c5c824891e7b9
tree52ae2d2068fd637dd03938d592e8a7492e49ab9f
parentb1cf0dab1e28433e06ab02cec033951ea0149ea3
parente87d56b665ca30a3e5920c23cd60c99b84341aa2
Merge branch 'master' into branch-1.8