Merge branch 'hotfix/1.1.11' v1.1.11
authorLaury GvR <laury@gaslightmedia.com>
Tue, 14 Apr 2015 20:55:29 +0000 (16:55 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 14 Apr 2015 20:55:29 +0000 (16:55 -0400)

Trivial merge