Merge branch 'master' into commercial

lib/handlers.js

@@ -52,7 +52,7 @@ module.exports.create = function (state) {
     || redirectHttpsAndClose
   );
   state.handleInsecureHttp = function (servername, socket) {
-    console.log("handleInsecureHttp('" + servername + "', socket)");
+    console.log("[handlers] insecure http for '" + servername + "'");
     socket.__my_servername = servername;
     state.httpInsecureServer.emit('connection', socket);
   };