Some Rakefile code styling
Merge branch 'master' into linux