Merge branch 'hotfix/1.1.30'
authorLaury GvR <laury@gaslightmedia.com>
Fri, 8 Jul 2016 16:53:34 +0000 (12:53 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 8 Jul 2016 16:53:34 +0000 (12:53 -0400)

Trivial merge