Merge branch 'hotfix/1.1.8' v1.1.8
authorLaury GvR <laury@gaslightmedia.com>
Tue, 14 Apr 2015 19:00:56 +0000 (15:00 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 14 Apr 2015 19:00:56 +0000 (15:00 -0400)

Trivial merge