From: Bdale Garbee <bdale@gag.com>
Date: Wed, 10 Sep 2014 06:02:57 +0000 (-0600)
Subject: Merge branch 'master' into branch-1.5
X-Git-Tag: 1.5~10
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=5de00e9e39cff2d3b409c2ce99caa994f0a36202

Merge branch 'master' into branch-1.5
---

5de00e9e39cff2d3b409c2ce99caa994f0a36202