consistent behavior regarding file uploads
Merge pull request #654 from ZogStriP/consistent-behavior-regarding-file-uploads

consistent behavior regarding file uploads