Merge branch 'master' into branch-1.6
authorBdale Garbee <bdale@gag.com>
Mon, 11 Jan 2016 02:07:49 +0000 (19:07 -0700)
committerBdale Garbee <bdale@gag.com>
Mon, 11 Jan 2016 02:07:49 +0000 (19:07 -0700)
commit1681776abc0873bcbbbc5b2b17e15d54a1031f51
treea06de674bb12d67e86608b7f7228129f1f902739
parent88309264656220bae6ee941211f7aa1b1dc19944
parentaebdcaf37eafbc13cce695fe65a455e49c6108c3
Merge branch 'master' into branch-1.6