Merge branch 'hotfix/1.1.31' v1.1.31
authorLaury GvR <laury@gaslightmedia.com>
Tue, 1 May 2018 21:07:50 +0000 (17:07 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 1 May 2018 21:07:50 +0000 (17:07 -0400)

Trivial merge