Merge branch 'hotfix/1.0.25' v1.0.25
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 20 Jun 2018 12:35:57 +0000 (08:35 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 20 Jun 2018 12:35:57 +0000 (08:35 -0400)

Trivial merge