Merge branch 'hotfix/1.0.37' v1.0.37
authorLaury GvR <laury@gaslightmedia.com>
Mon, 8 May 2017 21:58:19 +0000 (17:58 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 8 May 2017 21:58:19 +0000 (17:58 -0400)

Trivial merge