Merge branch 'master' into 2.x

serve.js

@@ -214,7 +214,7 @@ function run() {
       key: httpsOptions.key
     , cert: httpsOptions.cert
     //, ca: httpsOptions.ca
-  }
+    }
   , argv: argv
   };
   var peerCa;