Merge branch 'hotfix/1.0.25' v1.0.25
authorLaury GvR <laury@gaslightmedia.com>
Fri, 7 Sep 2018 20:25:39 +0000 (16:25 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 7 Sep 2018 20:25:39 +0000 (16:25 -0400)

Trivial merge