Fix rake task
Merge branch 'master' into stable