Merge branch 'release/1.0.25' v1.0.25
authorLaury GvR <laury@gaslightmedia.com>
Thu, 27 Jun 2019 16:42:43 +0000 (12:42 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 27 Jun 2019 16:42:43 +0000 (12:42 -0400)

Trivial merge