Merge branch 'master' into branch-1.6
authorBdale Garbee <bdale@gag.com>
Sat, 7 May 2016 00:11:01 +0000 (18:11 -0600)
committerBdale Garbee <bdale@gag.com>
Sat, 7 May 2016 00:11:01 +0000 (18:11 -0600)
commit15ae97fbdb4e75a74ea2e716194661d19dec46ff
treec141b70e4f6799e1fce5ade4ad632f99eb0247ff
parentac7be4a40df88ee3a0992e041635e4ac4cf5ac48
parent1216c0ccece4ca1492967a341c5d01e9e5068ed8
Merge branch 'master' into branch-1.6