Merge branch 'hotfix/1.0.25' v1.0.25
authorLaury GvR <laury@gaslightmedia.com>
Wed, 18 Apr 2018 19:51:30 +0000 (15:51 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 18 Apr 2018 19:51:30 +0000 (15:51 -0400)

Trivial merge