Merge branch 'release/1.0.26' v1.0.26
authorLaury GvR <laury@gaslightmedia.com>
Wed, 3 Oct 2018 16:08:24 +0000 (12:08 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 3 Oct 2018 16:08:24 +0000 (12:08 -0400)

Trivial merge