From: Bdale Garbee <bdale@gag.com>
Date: Sat, 7 May 2016 00:11:01 +0000 (-0600)
Subject: Merge branch 'master' into branch-1.6
X-Git-Tag: 1.6.3~1
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=15ae97fbdb4e75a74ea2e716194661d19dec46ff

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

15ae97fbdb4e75a74ea2e716194661d19dec46ff