From: Bdale Garbee <bdale@gag.com>
Date: Fri, 6 May 2016 23:59:39 +0000 (-0600)
Subject: Merge branch 'master' into branch-1.6
X-Git-Tag: 1.6.3~2
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=ac7be4a40df88ee3a0992e041635e4ac4cf5ac48

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

ac7be4a40df88ee3a0992e041635e4ac4cf5ac48