Merge branch 'hotfix/1.0.24' v1.0.24
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 7 Apr 2016 19:01:25 +0000 (15:01 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 7 Apr 2016 19:01:25 +0000 (15:01 -0400)

Trivial merge