Merge branch 'hotfix/1.1.10' v1.1.10
authorLaury GvR <laury@gaslightmedia.com>
Tue, 14 Apr 2015 19:54:39 +0000 (15:54 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 14 Apr 2015 19:54:39 +0000 (15:54 -0400)

Trivial merge