Merge branch 'MDL-58760-master-pixescape' of git://github.com/mudrd8mz/moodle

admin/tool/lp/templates/comment_area.mustache

@@ -30,7 +30,7 @@
     * autostart
     * canpost
     * cid
-    * collapsediconurl
+    * collapsediconkey
     * commentarea
     * component
     * contextid

lib/amd/src/templates.js

@@ -212,6 +212,10 @@ define(['core/mustache',
         var searchKey = this.currentThemeName + '/' + templateName;
         var template = templateCache[searchKey];
 
+        // The key might have been escaped by the JS Mustache engine which
+        // converts forward slashes to HTML entities. Let us undo that here.
+        key = key.replace(///gi, '/');
+
         return iconSystem.renderIcon(key, component, text, template);
     };