Merge branch 'hotfix/1.7.25' v1.7.25
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 6 Jun 2019 17:23:57 +0000 (13:23 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 6 Jun 2019 17:23:57 +0000 (13:23 -0400)

Trivial merge