Merge branch 'hotfix/1.0.26' v1.0.26
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 26 Sep 2017 16:56:56 +0000 (12:56 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 26 Sep 2017 16:56:56 +0000 (12:56 -0400)

Trivial merge