Load Rake tasks via Railtie
Merge branch 'master' into rails4