Merge branch 'hotfix/1.0.4' v1.0.4
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 12 Sep 2016 19:17:32 +0000 (15:17 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 12 Sep 2016 19:17:32 +0000 (15:17 -0400)
commit607bfe94068a493eadd031c54a136cd9a379385e
treee73ac8a07c5aa11e9c25b83efceb9019d7ad5bc6
parentb003b2b690c82e1caeca8e6df4fbdc4fb5db42c9
parentd8f895b1998611164d83885e396b0a70511e98d9
Merge branch 'hotfix/1.0.4'