Merge branch 'release/1.0.26' v1.0.26
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 21 Aug 2018 19:48:56 +0000 (15:48 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 21 Aug 2018 19:48:56 +0000 (15:48 -0400)

Trivial merge