Merge branch 'hotfix/1.0.24'
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 14 Jul 2016 20:09:33 +0000 (16:09 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 14 Jul 2016 20:09:33 +0000 (16:09 -0400)

Trivial merge