Merge branch 'release/1.0.24' v1.0.24
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 7 Mar 2016 20:51:11 +0000 (15:51 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 7 Mar 2016 20:51:11 +0000 (15:51 -0500)

Trivial merge