Merge branch 'hotfix/1.1.29' V1.1.29
authorLaury GvR <laury@gaslightmedia.com>
Thu, 11 Feb 2016 16:31:56 +0000 (11:31 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 11 Feb 2016 16:31:56 +0000 (11:31 -0500)

Trivial merge