merge in updated http-proxy