From: Bdale Garbee <bdale@gag.com>
Date: Tue, 6 Sep 2016 02:59:11 +0000 (-0600)
Subject: Merge branch 'master' into branch-1.6
X-Git-Tag: 1.6.8~1
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=c0ad087008856cfc2233b977abfc3f1dcbaccdcc;p=fw%2Faltos

Merge branch 'master' into branch-1.6
---

c0ad087008856cfc2233b977abfc3f1dcbaccdcc