Enable file uploads
Merge branch 'file-uploads'