Merge branch 'hotfix/1.0.39'
authorLaury GvR <laury@gaslightmedia.com>
Fri, 22 Apr 2016 16:06:54 +0000 (12:06 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 22 Apr 2016 16:06:54 +0000 (12:06 -0400)

Trivial merge