Merge branch 'release/1.0.26' v1.0.26
authorLaury GvR <laury@gaslightmedia.com>
Fri, 11 Nov 2016 18:52:50 +0000 (13:52 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 11 Nov 2016 18:52:50 +0000 (13:52 -0500)

Trivial merge