Merge branch 'master' into dev

packages/node_modules/node-red/settings.js

@@ -57,6 +57,11 @@ module.exports = {
     //  defaults to the working directory of the Node-RED process.
     //fileWorkingDirectory: "",
     
+    // Timeout in milliseconds for inbound WebSocket connections that do not
+    // match any configured node.
+    //  defaults to 5000
+    //inboundWebSocketTimeout: 5000,
+
     // The maximum length, in characters, of any message sent to the debug sidebar tab
     debugMaxLength: 1000,