Merge branch 'release/1.0.25' v1.0.25
authorLaury GvR <laury@gaslightmedia.com>
Tue, 6 Aug 2019 17:29:52 +0000 (13:29 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 6 Aug 2019 17:29:52 +0000 (13:29 -0400)

Trivial merge