Merge branch 'hotfix/1.1.37' v1.1.37
authorLaury GvR <laury@gaslightmedia.com>
Tue, 16 Jan 2018 19:20:56 +0000 (14:20 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 16 Jan 2018 19:20:56 +0000 (14:20 -0500)

Trivial merge