Merge branch 'hotfix/1.1.20' v1.1.20
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 19 Aug 2016 19:21:55 +0000 (15:21 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 19 Aug 2016 19:21:55 +0000 (15:21 -0400)
commita988ca6a8a9394ce23fa1792638a71a70925c940
treed34396ecc01fe70454776f8b33ab306bd22cc54b
parent365af696f17c2ea531db6f57bfb929f7a63a1464
parent39040040e8bbe67ac726390cb9d6788406e5e5f3
Merge branch 'hotfix/1.1.20'