Merge branch 'master' into rename-repo-url

morgan/morgan.d.ts

@@ -8,7 +8,7 @@ declare module "morgan" {
 
     import express = require('express');
 
-    module morgan {
+    namespace morgan {
 
         export function token<T>(name: string, callback: (req: express.Request, res: express.Response) => T): express.RequestHandler;
 
@@ -97,4 +97,4 @@ declare module "morgan" {
     function morgan(custom: (req: express.Request, res: express.Response) => string): express.RequestHandler
 
     export = morgan;
-}
+}