Fixing a syntax error in file upload
Merge remote-tracking branch 'refs/remotes/origin/master'