Update Rakefile
Update Rakefile
Merge remote-tracking branch 'upstream/master' into user-management