Merge branch 'hotfix/1.1.91' v1.1.91
authorLaury GvR <laury@gaslightmedia.com>
Mon, 15 Jun 2015 16:36:58 +0000 (12:36 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 15 Jun 2015 16:36:58 +0000 (12:36 -0400)

Trivial merge