Merge branch 'hotfix/1.0.29' v1.0.29
authorLaury GvR <laury@gaslightmedia.com>
Fri, 11 Nov 2016 19:07:25 +0000 (14:07 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 11 Nov 2016 19:07:25 +0000 (14:07 -0500)

Trivial merge