Merge branch 'hotfix/1.2.27'
authorLaury GvR <laury@gaslightmedia.com>
Fri, 8 Jul 2016 19:02:43 +0000 (15:02 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 8 Jul 2016 19:02:43 +0000 (15:02 -0400)

Trivial merge