Quick fix for #940
Attach/detach files on bulk uploads screen #887
Merge from master