Merge branch 'hotfix/1.1.24' V1.1.24
authorLaury GvR <laury@gaslightmedia.com>
Fri, 11 Dec 2015 17:59:00 +0000 (12:59 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 11 Dec 2015 17:59:00 +0000 (12:59 -0500)

Trivial merge