Merge branch 'hotfix/1.0.24' v1.0.24
authorLaury GvR <laury@gaslightmedia.com>
Thu, 18 May 2017 15:55:05 +0000 (11:55 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 18 May 2017 15:55:05 +0000 (11:55 -0400)

Trivial merge