Merge branch 'hotfix/1.0.25' v1.0.25
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 8 Mar 2019 14:49:27 +0000 (09:49 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 8 Mar 2019 14:49:27 +0000 (09:49 -0500)

Trivial merge