Merge remote-tracking branch 'upstream/master'

chai-http/chai-http-tests.ts

@@ -42,8 +42,7 @@ chai.request(app)
 
 chai.request(app)
 	.get('/search')
-	.query('name', 'foo')
-	.query('limit', '10');
+	.query({name: 'foo', limit: 10});
 
 chai.request(app)
 	.put('/user/me')

chai-http/chai-http.d.ts

@@ -51,7 +51,7 @@ declare module ChaiHttp {
 	interface Request extends FinishedRequest {
 		attach(field: string, file: string|Buffer, filename: string): Request;
 		set(field: string, val: string): Request;
-		query(key: string, value: string): Request;
+		query(params: Object): Request;
 		send(data: Object): Request;
 		auth(user: string, name: string): Request;
 		field(name: string, val: string): Request;