Applied patch by @ribalba to fix case where a form is uploaded multiple times with the same name