Merge branch 'hotfix/1.0.24' v1.0.24
authorIan Weller <ian@gaslightmedia.com>
Thu, 21 Aug 2014 19:22:54 +0000 (15:22 -0400)
committerIan Weller <ian@gaslightmedia.com>
Thu, 21 Aug 2014 19:22:54 +0000 (15:22 -0400)

Trivial merge