Merge branch 'hotfix/1.0.25' v1.0.25
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 24 Sep 2018 16:42:12 +0000 (12:42 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 24 Sep 2018 16:42:12 +0000 (12:42 -0400)

Trivial merge