Merge branch 'release/1.0.25' v1.0.25
authorLaury GvR <laury@gaslightmedia.com>
Wed, 3 Oct 2018 16:05:00 +0000 (12:05 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 3 Oct 2018 16:05:00 +0000 (12:05 -0400)

Trivial merge