Merge upstream/master

Author: prashaantt

react-router.d.ts

@@ -748,7 +748,7 @@ declare module ReactRouter {
 	 * @param {routes: RouteConfig}
 	 * @param {(error:Error, redirectLocation:Location, renderProps : Object) => void} callback
 	 */
-	export function match({routes: RouteConfig}, callback: (error: Error, redirectLocation: Location, renderProps: any) => void): void;
+	export function match(args: IMatchArgs, callback: (error: Error, redirectLocation: Location, renderProps: any) => void): void;
 
 	/**
 	 * Creates and returns an array of routes from the given object which may be a JSX route, a plain object route, or an array of either.