Merge branch 'hotfix/1.0.26' v1.0.26
authorLaury GvR <laury@gaslightmedia.com>
Fri, 29 Jul 2016 13:49:58 +0000 (09:49 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 29 Jul 2016 13:49:58 +0000 (09:49 -0400)

Trivial merge