Merge branch 'hotfix/1.0.37'
authorLaury GvR <laury@gaslightmedia.com>
Fri, 22 Apr 2016 12:55:04 +0000 (08:55 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 22 Apr 2016 12:55:04 +0000 (08:55 -0400)

Trivial merge