Merge branch 'hotfix/1.1.1' v1.1.1
authorLaury GvR <laury@gaslightmedia.com>
Fri, 10 Apr 2015 19:47:20 +0000 (15:47 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 10 Apr 2015 19:47:20 +0000 (15:47 -0400)

Trivial merge