Merge branch 'master' into dev

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

@@ -47,5 +47,9 @@
     <code>{{global.name}}</code>, or for persistable store <code>store</code> use <code>{{flow[store].name}}</code> or
     <code>{{global[store].name}}</code>.
     <p><b>Note: </b>By default, <i>mustache</i> will escape any non-alphanumeric or HTML entities in the values it substitutes.
-       To prevent this, use <code>{{{triple}}}</code> braces.
+       To prevent this, use <code>{{{triple}}}</code> braces.</p>
+    <p>If you need to use <code>{{ }}</code> within your content, you can change the characters
+       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>
 </script>