Merge branch 'hotfix/1.7.26' v1.7.26
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 19 Jun 2019 13:42:10 +0000 (09:42 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 19 Jun 2019 13:42:10 +0000 (09:42 -0400)

Trivial merge