Merge branch 'hotfix/1.0.22' v1.0.22
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 14 Jul 2016 19:28:07 +0000 (15:28 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 14 Jul 2016 19:28:07 +0000 (15:28 -0400)
commitf4563b23bfc272f9ea49ba84301c89048ee258fc
tree0336622b69e9a902ac5d7f891ce012385287a83c
parente03db4990f0eea9a33e498372aac64ac302b0d80
parent730b06af0d0158b5a4a80c9eee400a559ed253d6
Merge branch 'hotfix/1.0.22'