Merge branch 'master' into rename-repo-url

csurf/csurf.d.ts

@@ -5,7 +5,7 @@
 
 /// <reference path="../express/express.d.ts" />
 
-declare module Express {
+declare namespace Express {
   export interface Request {
     csrfToken(): string;
   }
@@ -19,7 +19,7 @@ declare module "csurf" {
     cookie?: csurf.CookieOptions | boolean;
   }): express.RequestHandler;
 
-  module csurf {
+  namespace csurf {
     export interface CookieOptions extends express.CookieOptions {
       key: string;
     }