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)
commitd99e7373988822d1f16e1587807e62b1f2a32063
tree1de20a599e96bf9261f80cc6791629c3a3f0e579
parent637970b5a820d737aebb60da2179c81c6284d0b5
parent05a73173f620645309995c09dab4de193a6d23d8
Merge branch 'hotfix/1.0.24'