Merge branch 'hotfix/1.1.5' v1.1.5
authorLaury GvR <laury@gaslightmedia.com>
Tue, 14 Apr 2015 18:30:00 +0000 (14:30 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 14 Apr 2015 18:30:00 +0000 (14:30 -0400)

Trivial merge