Merge branch 'hotfix/1.0.24' v1.0.24
authorLaury GvR <laury@gaslightmedia.com>
Thu, 1 Oct 2015 20:33:05 +0000 (16:33 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 1 Oct 2015 20:33:05 +0000 (16:33 -0400)

Trivial merge