Merge branch 'release/1.0.26' v1.0.26
authorLaury GvR <laury@gaslightmedia.com>
Tue, 17 Jul 2018 19:21:48 +0000 (15:21 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 17 Jul 2018 19:21:48 +0000 (15:21 -0400)

Trivial merge