Pull in some upstream updates to http_accept_language