Merge branch 'hotfix/1.0.25' v1.0.25
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 27 Apr 2018 18:23:29 +0000 (14:23 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 27 Apr 2018 18:23:29 +0000 (14:23 -0400)

Trivial merge