Merge branch 'release/1.0.25' v1.0.25
authorLaury GvR <laury@gaslightmedia.com>
Thu, 24 Jan 2019 21:00:23 +0000 (16:00 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 24 Jan 2019 21:00:23 +0000 (16:00 -0500)

Trivial merge