Merge branch 'hotfix/1.0.29' v1.0.29
authorLaury GvR <laury@gaslightmedia.com>
Mon, 4 Apr 2016 15:29:59 +0000 (11:29 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 4 Apr 2016 15:29:59 +0000 (11:29 -0400)

Trivial merge