Merge branch 'hotfix/1.1.92' v1.1.92
authorLaury GvR <laury@gaslightmedia.com>
Mon, 15 Jun 2015 19:12:38 +0000 (15:12 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 15 Jun 2015 19:12:38 +0000 (15:12 -0400)

Trivial merge