Merge branch 'hotfix/1.0.25' v1.0.25
authorLaury GvR <laury@gaslightmedia.com>
Mon, 20 Nov 2017 19:15:00 +0000 (14:15 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 20 Nov 2017 19:15:00 +0000 (14:15 -0500)

Trivial merge