Merge branch 'hotfix/1.1.4' v1.1.4
authorLaury GvR <laury@gaslightmedia.com>
Tue, 14 Apr 2015 16:11:04 +0000 (12:11 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 14 Apr 2015 16:11:04 +0000 (12:11 -0400)

Trivial merge