Merge branch 'master' into branch-1.6
authorBdale Garbee <bdale@gag.com>
Mon, 11 Jan 2016 02:04:49 +0000 (19:04 -0700)
committerBdale Garbee <bdale@gag.com>
Mon, 11 Jan 2016 02:04:49 +0000 (19:04 -0700)
commit70e9064ca962dfd345f8a342afa130f969606553
treee8e374912df403e7e237aecbd1ec0a19fa6c5c42
parent489d22f448d9927533e90da4d16c5a332a234a8d
parent73ce3f73526edfabccd3b98e6e67de6d82a84b63
Merge branch 'master' into branch-1.6