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

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

b3fba989a84db7d904e09a8f47e3a86d4e0f9577