Fix the syntax for File.cp_r
Merge branch 'master' into patch-1