Merge branch 'release/1.0.25' v1.0.25
authorLaury GvR <laury@gaslightmedia.com>
Thu, 31 May 2018 21:19:04 +0000 (17:19 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 31 May 2018 21:19:04 +0000 (17:19 -0400)

Trivial merge