Merge branch 'hotfix/1.1.21' v1.1.21
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 12 Sep 2016 18:27:01 +0000 (14:27 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 12 Sep 2016 18:27:01 +0000 (14:27 -0400)
commitfcf43c8cda5160a1d63ea7ec36f78b438b288e15
tree6d9520d7f10b379ecda2b61219b217384b37f4ae
parenta988ca6a8a9394ce23fa1792638a71a70925c940
parent6f4f87051b2d61b00d8325920c73c88af45b6786
Merge branch 'hotfix/1.1.21'