merge master
HttpRequest's uri() should remain mutable