multiple file upload and delete fix
Merge remote-tracking branch 'origin/master'