Merge branch 'release/1.1.26' v1.1.26
authorLaury GvR <laury@gaslightmedia.com>
Mon, 2 Oct 2017 18:59:48 +0000 (14:59 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 2 Oct 2017 18:59:48 +0000 (14:59 -0400)

Trivial merge