Fix Rake tasks path
Merge branch 'master' into rails4