Merge branch 'hotfix/1.1.8' v1.1.8
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 12 Sep 2016 18:02:02 +0000 (14:02 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 12 Sep 2016 18:02:02 +0000 (14:02 -0400)
commit561f74abb5c668bfc299524a675a86591fc2acf3
tree317349dde5493cfd6a766a052bfedef1aea2a701
parentd21480e84327154fa23e151e5705740659112c8f
parent1580cc34ade8d8d079ce89e1eba46666502666c9
Merge branch 'hotfix/1.1.8'