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

Trivial merge