Merge branch 'hotfix/1.0.26' v1.0.26
authorLaury GvR <laury@gaslightmedia.com>
Mon, 7 Nov 2016 21:40:36 +0000 (16:40 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 7 Nov 2016 21:40:36 +0000 (16:40 -0500)

Trivial merge