#6496: Check a file's filesize before uploading it to the server.
Merge conflict.
Merge pull request #6543 from openscholar/6496-filesize_check

Check a file's filesize before uploading it to the server.