Merge branch 'master' into dev

packages/node_modules/@node-red/nodes/locales/en-US/common/90-comment.html

@@ -18,5 +18,5 @@
     <p>A node you can use to add comments to your flows.</p>
     <h3>Details</h3>
     <p>The edit panel will accept Markdown syntax. The text will be rendered into
-    this information side panel.</p>
+    the information side panel.</p>
 </script>

packages/node_modules/@node-red/nodes/locales/en-US/function/80-template.html

@@ -52,4 +52,7 @@
        used to mark the templated sections. For example, to use <code>[[ ]]</code>
        instead, add the following line to the top of the template:</p>
     <pre>{{=[[ ]]=}}</pre>
+    <h4>Using environment variables</h4>
+    <p>The template node can access environment variables using the syntax:</p>
+    <pre>My favourite colour is {{env.COLOUR}}.</pre>
 </script>

packages/node_modules/@node-red/nodes/locales/en-US/messages.json

@@ -446,7 +446,9 @@
             "staticTopic": "Subscribe to single topic",
             "dynamicTopic": "Dynamic subscription",
             "auto-connect": "Connect automatically",
-            "auto-mode-depreciated": "This option is depreciated. Please use the new auto-detect mode."
+            "auto-mode-depreciated": "This option is depreciated. Please use the new auto-detect mode.",
+            "none": "none",
+            "other": "other"
         },
         "sections-label": {
             "birth-message": "Message sent on connection (birth message)",
@@ -554,7 +556,8 @@
         },
         "status": {
             "requesting": "requesting"
-        }
+        },
+        "insecureHTTPParser": "Disable strict HTTP parsing"
     },
     "websocket": {
         "label": {