Merge branch 'hotfix/1.1.1' v1.1.1
authorLaury GvR <laury@gaslightmedia.com>
Tue, 10 Mar 2015 18:43:01 +0000 (14:43 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 10 Mar 2015 18:43:01 +0000 (14:43 -0400)

Trivial merge