From: Bdale Garbee <bdale@gag.com>
Date: Mon, 11 Jan 2016 02:07:49 +0000 (-0700)
Subject: Merge branch 'master' into branch-1.6
X-Git-Tag: 1.6.2~2
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=1681776abc0873bcbbbc5b2b17e15d54a1031f51

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

1681776abc0873bcbbbc5b2b17e15d54a1031f51