Merge branch 'hotfix/1.1.25' v1.1.25
authorLaury GvR <laury@gaslightmedia.com>
Tue, 16 Jan 2018 20:07:38 +0000 (15:07 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 16 Jan 2018 20:07:38 +0000 (15:07 -0500)

Trivial merge