Merge branch 'master' into branch-1.6
authorBdale Garbee <bdale@gag.com>
Tue, 6 Sep 2016 02:59:11 +0000 (20:59 -0600)
committerBdale Garbee <bdale@gag.com>
Tue, 6 Sep 2016 02:59:11 +0000 (20:59 -0600)
commitc0ad087008856cfc2233b977abfc3f1dcbaccdcc
treeadc46abc430793112858ce5d1822d3fe0a395e71
parent148b013dd29c26920ddfb53449ed4d8cc5a4b5ee
parent4fdf8ca9ca1cd5a84b03bd7a03c5806af64b413d
Merge branch 'master' into branch-1.6