Merge branch 'hotfix/1.1.27'
authorLaury GvR <laury@gaslightmedia.com>
Wed, 15 Jun 2016 21:10:26 +0000 (17:10 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 15 Jun 2016 21:10:26 +0000 (17:10 -0400)
commita8c89b2f1a17e3898cc39184e86782a3e388a1d0
treea2a3c9ca03e3fc6a14fed26175af34b466c118ea
parentd38226745f0aa33a422e4d413b04549ec87ad90b
parent83f18f0c35320ea9c1568017850c53ef6a6c6334
Merge branch 'hotfix/1.1.27'