Merge branch 'hotfix/1.0.24' v1.0.24
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 24 Oct 2016 20:39:55 +0000 (16:39 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 24 Oct 2016 20:39:55 +0000 (16:39 -0400)

Trivial merge