Merge branch 'release/1.0.26' v1.0.26
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 14 Jun 2018 13:12:51 +0000 (09:12 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 14 Jun 2018 13:12:51 +0000 (09:12 -0400)

Trivial merge