Merge branch 'hotfix/1.0.26' v1.0.26
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 8 Jun 2018 15:33:26 +0000 (11:33 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 8 Jun 2018 15:33:26 +0000 (11:33 -0400)

Trivial merge