Merge branch 'hotfix/1.0.26' v1.0.26
authorLaury GvR <laury@gaslightmedia.com>
Wed, 18 Apr 2018 19:53:56 +0000 (15:53 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 18 Apr 2018 19:53:56 +0000 (15:53 -0400)

Trivial merge