Marge master revision to file upload fix script.