Crashing on multi file upload, about to merge in new changes from master