Merge branch 'release/1.0.25' v1.0.25
authorLaury GvR <laury@gaslightmedia.com>
Tue, 3 Jul 2018 14:04:54 +0000 (10:04 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 3 Jul 2018 14:04:54 +0000 (10:04 -0400)

Trivial merge