added fix for file uploads
Merge branch 'upload-fix'