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

Trivial merge