Merge branch 'hotfix/1.1.26'
authorLaury GvR <laury@gaslightmedia.com>
Wed, 15 Jun 2016 21:06:39 +0000 (17:06 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 15 Jun 2016 21:06:39 +0000 (17:06 -0400)

Trivial merge