Merge remote-tracking branch 'remotes/upstream/switch-0.9.5' into switch-0.9.5

Conflicts:
	jquery/jquery-tests.ts
	q/Q-tests.ts
	q/Q.d.ts

jquery/jquery-tests.ts

@@ -2373,6 +2373,7 @@ function test_EventIsCallable() {
 }
 
 $.when<any>($.ajax("/my/page.json")).then(a => a.asdf); // is type JQueryPromise<any>
+$.when($.ajax("/my/page.json")).then((a?,b?,c?) => a.asdf); // is type JQueryPromise<any>
 $.when("asdf", "jkl;").done((x,y) => x.length + y.length, (x,y) => x.length + y.length);
 
 var f1 = $.when("fetch"); // Is type JQueryPromise<string>