Merge branch 'hotfix/1.1.5' v1.0.19 v1.1.5
authorLaury GvR <laury@gaslightmedia.com>
Tue, 10 Mar 2015 20:40:49 +0000 (16:40 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 10 Mar 2015 20:40:49 +0000 (16:40 -0400)

Trivial merge