Merge branch 'hotfix/1.1.9' v1.1.9
authorLaury GvR <laury@gaslightmedia.com>
Tue, 14 Apr 2015 19:41:11 +0000 (15:41 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 14 Apr 2015 19:41:11 +0000 (15:41 -0400)

Trivial merge