Merge improvements to ContentType and MultipartForm
Fix content length