Merge branch 'hotfix/1.0.24' v1.0.24
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 10 Oct 2016 15:55:04 +0000 (11:55 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 10 Oct 2016 15:55:04 +0000 (11:55 -0400)

Trivial merge