Merge branch 'release/1.1.26' v1.1.26
authorLaury GvR <laury@gaslightmedia.com>
Tue, 20 Feb 2018 20:58:34 +0000 (15:58 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 20 Feb 2018 20:58:34 +0000 (15:58 -0500)

Trivial merge