merging updates to expressjs/multer into fork