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

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

05e4094411f861bf29bea2e9c39c1b66f8f267f8