Merge branch 'release/1.0.24' v1.0.24
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 17 Mar 2015 16:59:15 +0000 (12:59 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 17 Mar 2015 16:59:15 +0000 (12:59 -0400)

Trivial merge