Merge branch 'hotfix/1.1.29'
authorLaury GvR <laury@gaslightmedia.com>
Thu, 16 Jun 2016 18:32:23 +0000 (14:32 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 16 Jun 2016 18:32:23 +0000 (14:32 -0400)

Trivial merge