Merge branch 'hotfix/1.1.38' v1.1.38
authorLaury GvR <laury@gaslightmedia.com>
Tue, 16 Jan 2018 20:10:01 +0000 (15:10 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 16 Jan 2018 20:10:01 +0000 (15:10 -0500)

Trivial merge