Merge branch 'hotfix/1.0.26' v1.0.26
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 8 Apr 2019 13:14:14 +0000 (09:14 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 8 Apr 2019 13:14:14 +0000 (09:14 -0400)

Trivial merge