diff --git a/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-debug.js b/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-debug.js
index b57dbf19741..47c967e0004 100644
--- a/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-debug.js
+++ b/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-debug.js
@@ -387,6 +387,9 @@ M.editor_atto = M.editor_atto || {
         // Copy text to editable div.
         atto.append(textarea.get('value'));
 
+        // Clean it.
+        atto.cleanHTML();
+
         // Add the toolbar and editable zone to the page.
         textarea.get('parentNode').insert(wrapper, textarea);
         atto.setStyle('color', textarea.getStyle('color'));
@@ -463,6 +466,9 @@ M.editor_atto = M.editor_atto || {
             node.remove(true);
         });
 
+        // Remove any and all nasties from source.
+        atto.cleanHTML();
+
         return atto.getHTML();
     },
 
@@ -719,6 +725,70 @@ Y.extend(CONTROLMENU, M.core.dialogue, {
 
 M.editor_atto = M.editor_atto || {};
 M.editor_atto.controlmenu = CONTROLMENU;
+/**
+ * Class for cleaning ugly HTML.
+ * Rewritten JS from jquery-clean plugin.
+ *
+ * @module editor_atto
+ * @chainable
+ */
+function cleanHTML() {
+    var cleaned = this.getHTML();
+
+    // What are we doing ?
+    // We are cleaning random HTML from all over the shop into a set of useful html suitable for content.
+    // We are allowing styles etc, but not e.g. font tags, class="MsoNormal" etc.
+
+    var rules = [
+        // Source: "http://stackoverflow.com/questions/2875027/clean-microsoft-word-pasted-text-using-javascript"
+        // Source: "http://stackoverflow.com/questions/1068280/javascript-regex-multiline-flag-doesnt-work"
+
+        // Remove all HTML comments.
+        {regex: /<!--[\s\S]*?-->/gi, replace: ""},
+        // Source: "http://www.1stclassmedia.co.uk/developers/clean-ms-word-formatting.php"
+        // Remove <?xml>, <\?xml>.
+        {regex: /<\\?\?xml[^>]*>/gi, replace: ""},
+        // Remove <o:blah>, <\o:blah>.
+        {regex: /<\/?\w+:[^>]*>/gi, replace: ""}, // e.g. <o:p...
+        // Remove MSO-blah, MSO:blah (e.g. in style attributes)
+        {regex: /\s*MSO[-:][^;"']*;?/gi, replace: ""},
+        // Remove empty spans
+        {regex: /<span[^>]*>(&nbsp;|\s)*<\/span>/gi, replace: ""},
+        // Remove class="Msoblah"
+        {regex: /class="Mso[^"]*"/gi, replace: ""},
+
+        // Source: "http://www.codinghorror.com/blog/2006/01/cleaning-words-nasty-html.html"
+        // Remove forbidden tags for content, title, meta, style, st0-9, head, font, html, body.
+        {regex: /<(\/?title|\/?meta|\/?style|\/?st\d|\/?head|\/?font|\/?html|\/?body|!\[)[^>]*?>/gi, replace: ""},
+
+        // Source: "http://www.tim-jarrett.com/labs_javascript_scrub_word.php"
+        // Replace extended chars with simple text.
+        {regex: new RegExp(String.fromCharCode(8220), 'gi'), replace: '"'},
+        {regex: new RegExp(String.fromCharCode(8216), 'gi'), replace: "'"},
+        {regex: new RegExp(String.fromCharCode(8217), 'gi'), replace: "'"},
+        {regex: new RegExp(String.fromCharCode(8211), 'gi'), replace: '-'},
+        {regex: new RegExp(String.fromCharCode(8212), 'gi'), replace: '--'},
+        {regex: new RegExp(String.fromCharCode(189), 'gi'), replace: '1/2'},
+        {regex: new RegExp(String.fromCharCode(188), 'gi'), replace: '1/4'},
+        {regex: new RegExp(String.fromCharCode(190), 'gi'), replace: '3/4'},
+        {regex: new RegExp(String.fromCharCode(169), 'gi'), replace: '(c)'},
+        {regex: new RegExp(String.fromCharCode(174), 'gi'), replace: '(r)'},
+        {regex: new RegExp(String.fromCharCode(8230), 'gi'), replace: '...'}
+    ];
+
+    var i = 0, rule;
+
+    for (i = 0; i < rules.length; i++) {
+        rule = rules[i];
+        cleaned = cleaned.replace(rule.regex, rule.replace);
+    }
+
+    this.setHTML(cleaned);
+    return this;
+}
+
+Y.Node.addMethod("cleanHTML", cleanHTML);
+Y.NodeList.importMethod(Y.Node.prototype, "cleanHTML");
 
 
 }, '@VERSION@', {"requires": ["node", "io", "overlay", "escape", "event", "moodle-core-notification"]});
diff --git a/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js b/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
index d4bc57078fa..113a2c9cdda 100644
--- a/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
+++ b/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
@@ -1,2 +1,2 @@
-YUI.add("moodle-editor_atto-editor",function(e,t){CSS={CONTENT:"editor_atto_content",CONTENTWRAPPER:"editor_atto_content_wrap",TOOLBAR:"editor_atto_toolbar",WRAPPER:"editor_atto"},M.editor_atto=M.editor_atto||{buttonhandlers:{},textupdatedhandlers:{},menus:{},menuhandlers:{},filepickeroptions:{},widgets:{},showhide_menu_handler:function(e){e.preventDefault();var t=this.getAttribute("disabled"),n=this.getAttribute("data-menu"),r=M.editor_atto.menus[n],i=r.get("bodyContent");r.get("visible")||t?(r.hide(),i.detach("clickoutside")):(i.on("clickoutside",function(e){e.target.ancestor()!==this&&e.target!==this&&r.get("visible")&&(i.detach("clickoutside"),r.hide())},this),r.show(),r.bodyNode.one("a").focus())},buttonclicked_handler:function(e){var t=this.getAttribute("data-editor"),n=this.getAttribute("data-plugin"),r=this.getAttribute("data-handler"),i=M.editor_atto.menus[n+"_"+t];i&&i.hide();if(M.editor_atto.is_enabled(t,n))return r=M.editor_atto.buttonhandlers[r],r(e,t)},is_enabled:function(t,n){var r=e.one("#"+t+"_toolbar .atto_"+n+"_button");return!r.hasAttribute("disabled")},disable_all_widgets:function(t){var n,r;for(n in M.editor_atto.widgets)r=e.one("#"+t+"_toolbar .atto_"+n+"_button"),r&&r.setAttribute("disabled","true")},enable_widget:function(t,n){var r=e.one("#"+t+"_toolbar .atto_"+n+"_button");r&&r.removeAttribute("disabled")},enable_all_widgets:function(t){var n,r;for(n in M.editor_atto.widgets)r=e.one("#"+t+"_toolbar .atto_"+n+"_button"),r&&r.removeAttribute("disabled")},add_text_updated_handler:function(e,t){e in M.editor_atto.textupdatedhandlers||(M.editor_atto.textupdatedhandlers[e]=[]),M.editor_atto.textupdatedhandlers[e].push(t)},add_toolbar_menu:function(t,n,r,i,s){var o=e.one("#"+t+"_toolbar"),u=e.one("#"+t+"_toolbar .atto_group."+i+"_group"),a,f,l;u||(u=e.Node.create('<div class="atto_group '+i+'_group"></div>'),o.append(u)),l=M.util.image_url("t/expanded","moodle"),f=e.Node.create('<button class="atto_'+n+'_button atto_hasmenu" '+'data-editor="'+e.Escape.html(t)+'" '+'tabindex="-1" '+'data-menu="'+n+"_"+t+'" '+'title="'+e.Escape.html(M.util.get_string("pluginname","atto_"+n))+'">'+'<img class="icon" aria-hidden="true" role="presentation" width="16" height="16" src="'+r+'"/>'+'<img class="icon" aria-hidden="true" role="presentation" width="16" height="16" src="'+l+'"/>'+"</button>"),u.append(f),a=o.getAttribute("aria-activedescendant"),a||(f.setAttribute("tabindex","0"),o.setAttribute("aria-activedescendant",f.generateID())),M.editor_atto.widgets[n]=n;var c=e.Node.create('<div class="atto_'+n+"_menu"+' atto_menu" data-editor="'+e.Escape.html(t)+'"></div>'),h=0,p={};for(h=0;h<s.length;h++)p=s[h],c.append(e.Node.create('<div class="atto_menuentry"><a href="#" class="atto_'+n+"_action_"+h+'" '+'data-editor="'+e.Escape.html(t)+'" '+'data-plugin="'+e.Escape.html(n)+'" '+'data-handler="'+e.Escape.html(n+"_action_"+h)+'">'+p.text+"</a>"+"</div>")),M.editor_atto.buttonhandlers[n+"_action_"+h]||(e.one("body").delegate("click",M.editor_atto.buttonclicked_handler,".atto_"+n+"_action_"+h),e.one("body").delegate("key",M.editor_atto.buttonclicked_handler,"space,enter",".atto_"+n+"_action_"+h),M.editor_atto.buttonhandlers[n+"_action_"+h]=p.handler);M.editor_atto.buttonhandlers[n]||(e.one("body").delegate("click",M.editor_atto.showhide_menu_handler,".atto_"+n+"_button"),M.editor_atto.buttonhandlers[n]=!0);var d=new M.core.dialogue({bodyContent:c,visible:!1,width:"14em",zindex:100,lightbox:!1,closeButton:!1,center:!1});M.editor_atto.menus[n+"_"+t]=d,d.render(),d.align(f,[e.WidgetPositionAlign.TL,e.WidgetPositionAlign.BL]),d.hide(),d.headerNode.hide()},add_toolbar_button:function(t,n,r,i,s){var o=e.one("#"+t+"_toolbar"),u=e.one("#"+t+"_toolbar .atto_group."+i+"_group"),a,f;u||(u=e.Node.create('<div class="atto_group '+i+'_group"></div>'),o.append(u)),a=e.Node.create('<button class="atto_'+n+'_button" '+'data-editor="'+e.Escape.html(t)+'" '+'data-plugin="'+e.Escape.html(n)+'" '+'tabindex="-1" '+'data-handler="'+e.Escape.html(n)+'" '+'title="'+e.Escape.html(M.util.get_string("pluginname","atto_"+n))+'">'+'<img class="icon" aria-hidden="true" role="presentation" width="16" height="16" src="'+r+'"/>'+"</button>"),u.append(a),f=o.getAttribute("aria-activedescendant"),f||(a.setAttribute("tabindex","0"),o.setAttribute("aria-activedescendant",a.generateID())),M.editor_atto.buttonhandlers[n]||(e.one("body").delegate("click",M.editor_atto.buttonclicked_handler,".atto_"+n+"_button"),M.editor_atto.buttonhandlers[n]=s),M.editor_atto.widgets[n]=n},is_active:function(t){var n=M.editor_atto.get_selection();n.length&&(n=n.pop());var r=null;return n.parentElement?r=e.one(n.parentElement()):r=e.one(n.startContainer),r&&r.ancestor("#"+t+"editable")!==null},focus:function(t){e.one("#"+t+"editable").focus()},init:function(t){var n=e.Node.create('<div class="'+CSS.WRAPPER+'" />'),r=e.Node.create('<div id="'+t.elementid+'editable" '+'contenteditable="true" '+'spellcheck="true" '+'class="'+CSS.CONTENT+'" />'),i="",s=e.Node.create('<div class="'+CSS.TOOLBAR+'" id="'+t.elementid+'_toolbar" role="toolbar"/>'),o=e.Node.create('<div class="'+CSS.CONTENTWRAPPER+'" />'),u=t.elementid.replace(":","\\:"),a=e.one("#"+u);o.appendChild(r),n.appendChild(s),n.appendChild(o);var f=e.io(t.content_css,{sync:!0}),l=f.responseText.indexOf("font:");l&&(i=f.responseText.substring(l+"font:".length,f.responseText.length-1),r.setStyle("font",i)),r.setStyle("minHeight",1.2*a.getAttribute("rows")+"em"),r.append(a.get("value")),a.get("parentNode").insert(n,a),r.setStyle("color",a.getStyle("color")),r.setStyle("lineHeight",a.getStyle("lineHeight")),r.setStyle("fontSize",a.getStyle("fontSize")),a.hide(),r.on("blur",function(){this.text_updated(u)},this),e.one(e.config.doc.body).delegate("key",this.keyboard_navigation,"down:37,39","#"+u+"_toolbar",this,u),M.editor_atto.filepickeroptions[u]=t.filepickeroptions;var c,h;for(c=0;c<t.plugins.length;c++){var p=t.plugins[c].group;for(h=0;h<t.plugins[c].plugins.length;h++){var d=t.plugins[c].plugins[h]
-;d.params.elementid=u,d.params.group=p,M["atto_"+d.name].init(d.params)}}},text_updated:function(t){var n=e.one("#"+t),r=this.get_clean_html(t);n.set("value",r);var i=0;if(t in M.editor_atto.textupdatedhandlers)for(i=0;i<M.editor_atto.textupdatedhandlers[t].length;i++){var s=M.editor_atto.textupdatedhandlers[t][i];s(t)}},get_clean_html:function(t){var n=e.one("#"+t+"editable").cloneNode(!0);return e.each(n.all("[id]"),function(e){var t=e.get("id");t.indexOf("yui")===0&&e.removeAttribute("id")}),e.each(n.all(".atto_control"),function(e){e.remove(!0)}),n.getHTML()},keyboard_navigation:function(t,n){var r,i,s,o;t.preventDefault(),r=e.all("#"+n+"_toolbar button"),s=e.one("#"+n+"_toolbar").getAttribute("aria-activedescendant");if(!s)return;i=e.one("#"+s),i.setAttribute("tabindex","-1"),o=r.indexOf(i),t.keyCode===37?(o--,o<0&&(o=r.size()-1)):(o++,o>=r.size()&&(o=0)),i=r.item(o),i.setAttribute("tabindex","0"),i.focus(),e.one("#"+n+"_toolbar").setAttribute("aria-activedescendant",i.generateID())},can_show_filepicker:function(e,t){var n=M.editor_atto.filepickeroptions[e];return typeof n[t]!="undefined"},show_filepicker:function(t,n,r){e.use("core_filepicker",function(e){var i=M.editor_atto.filepickeroptions[t][n];i.formcallback=r,i.editor_target=e.one(t),M.core_filepicker.show(e,i)})},get_selection_from_node:function(e){var t;return window.getSelection?(t=document.createRange(),t.setStartBefore(e.getDOMNode()),t.setEndAfter(e.getDOMNode()),[t]):document.selection?(t=document.body.createTextRange(),t.moveToElementText(e.getDOMNode()),t):!1},get_selection:function(){if(window.getSelection){var e=window.getSelection(),t=[],n=0;for(n=0;n<e.rangeCount;n++)t.push(e.getRangeAt(n));return t}return document.selection&&document.selection.createRange?document.selection.createRange():!1},selection_contains_node:function(e){var t,n;if(window.getSelection){n=window.getSelection();if(n.containsNode)return n.containsNode(e.getDOMNode(),!0)}return n=document.selection.createRange(),t=n.duplicate(),t.moveToElementText(e.getDOMNode()),n.inRange(t)},get_selection_parent_node:function(){var e=M.editor_atto.get_selection();if(e.length>0)return e[0].commonAncestorContainer},get_selection_text:function(){var e=M.editor_atto.get_selection();if(e.length>0&&e[0].cloneContents)return e[0].cloneContents()},set_selection:function(e){var t,n;if(window.getSelection){t=window.getSelection(),t.removeAllRanges();for(n=0;n<e.length;n++)t.addRange(e[n])}else document.selection&&e.select&&e.select()}};var n="Controlmenu",r;r=function(e){e.draggable=!1,e.center=!1,e.width="auto",e.lightbox=!1,e.footerContent="",r.superclass.constructor.apply(this,[e])},e.extend(r,M.core.dialogue,{initializer:function(t){var n,i,s;r.superclass.initializer.call(this,t),s=this.get("boundingBox"),s.addClass("editor_atto_controlmenu"),n=this.bodyNode,i=e.Node.create("<h3/>"),i.addClass("accesshide"),i.setHTML(this.get("headerText")),n.prepend(i),n.on("clickoutside",function(e){this.get("visible")&&(e.target.ancestor(".atto_control")||(e.preventDefault(),this.hide()))},this)}},{NAME:n,ATTRS:{headerText:{value:""}}}),M.editor_atto=M.editor_atto||{},M.editor_atto.controlmenu=r},"@VERSION@",{requires:["node","io","overlay","escape","event","moodle-core-notification"]});
+YUI.add("moodle-editor_atto-editor",function(e,t){function i(){var e=this.getHTML(),t=[{regex:/<!--[\s\S]*?-->/gi,replace:""},{regex:/<\\?\?xml[^>]*>/gi,replace:""},{regex:/<\/?\w+:[^>]*>/gi,replace:""},{regex:/\s*MSO[-:][^;"']*;?/gi,replace:""},{regex:/<span[^>]*>(&nbsp;|\s)*<\/span>/gi,replace:""},{regex:/class="Mso[^"]*"/gi,replace:""},{regex:/<(\/?title|\/?meta|\/?style|\/?st\d|\/?head|\/?font|\/?html|\/?body|!\[)[^>]*?>/gi,replace:""},{regex:new RegExp(String.fromCharCode(8220),"gi"),replace:'"'},{regex:new RegExp(String.fromCharCode(8216),"gi"),replace:"'"},{regex:new RegExp(String.fromCharCode(8217),"gi"),replace:"'"},{regex:new RegExp(String.fromCharCode(8211),"gi"),replace:"-"},{regex:new RegExp(String.fromCharCode(8212),"gi"),replace:"--"},{regex:new RegExp(String.fromCharCode(189),"gi"),replace:"1/2"},{regex:new RegExp(String.fromCharCode(188),"gi"),replace:"1/4"},{regex:new RegExp(String.fromCharCode(190),"gi"),replace:"3/4"},{regex:new RegExp(String.fromCharCode(169),"gi"),replace:"(c)"},{regex:new RegExp(String.fromCharCode(174),"gi"),replace:"(r)"},{regex:new RegExp(String.fromCharCode(8230),"gi"),replace:"..."}],n=0,r;for(n=0;n<t.length;n++)r=t[n],e=e.replace(r.regex,r.replace);return this.setHTML(e),this}CSS={CONTENT:"editor_atto_content",CONTENTWRAPPER:"editor_atto_content_wrap",TOOLBAR:"editor_atto_toolbar",WRAPPER:"editor_atto"},M.editor_atto=M.editor_atto||{buttonhandlers:{},textupdatedhandlers:{},menus:{},menuhandlers:{},filepickeroptions:{},widgets:{},showhide_menu_handler:function(e){e.preventDefault();var t=this.getAttribute("disabled"),n=this.getAttribute("data-menu"),r=M.editor_atto.menus[n],i=r.get("bodyContent");r.get("visible")||t?(r.hide(),i.detach("clickoutside")):(i.on("clickoutside",function(e){e.target.ancestor()!==this&&e.target!==this&&r.get("visible")&&(i.detach("clickoutside"),r.hide())},this),r.show(),r.bodyNode.one("a").focus())},buttonclicked_handler:function(e){var t=this.getAttribute("data-editor"),n=this.getAttribute("data-plugin"),r=this.getAttribute("data-handler"),i=M.editor_atto.menus[n+"_"+t];i&&i.hide();if(M.editor_atto.is_enabled(t,n))return r=M.editor_atto.buttonhandlers[r],r(e,t)},is_enabled:function(t,n){var r=e.one("#"+t+"_toolbar .atto_"+n+"_button");return!r.hasAttribute("disabled")},disable_all_widgets:function(t){var n,r;for(n in M.editor_atto.widgets)r=e.one("#"+t+"_toolbar .atto_"+n+"_button"),r&&r.setAttribute("disabled","true")},enable_widget:function(t,n){var r=e.one("#"+t+"_toolbar .atto_"+n+"_button");r&&r.removeAttribute("disabled")},enable_all_widgets:function(t){var n,r;for(n in M.editor_atto.widgets)r=e.one("#"+t+"_toolbar .atto_"+n+"_button"),r&&r.removeAttribute("disabled")},add_text_updated_handler:function(e,t){e in M.editor_atto.textupdatedhandlers||(M.editor_atto.textupdatedhandlers[e]=[]),M.editor_atto.textupdatedhandlers[e].push(t)},add_toolbar_menu:function(t,n,r,i,s){var o=e.one("#"+t+"_toolbar"),u=e.one("#"+t+"_toolbar .atto_group."+i+"_group"),a,f,l;u||(u=e.Node.create('<div class="atto_group '+i+'_group"></div>'),o.append(u)),l=M.util.image_url("t/expanded","moodle"),f=e.Node.create('<button class="atto_'+n+'_button atto_hasmenu" '+'data-editor="'+e.Escape.html(t)+'" '+'tabindex="-1" '+'data-menu="'+n+"_"+t+'" '+'title="'+e.Escape.html(M.util.get_string("pluginname","atto_"+n))+'">'+'<img class="icon" aria-hidden="true" role="presentation" width="16" height="16" src="'+r+'"/>'+'<img class="icon" aria-hidden="true" role="presentation" width="16" height="16" src="'+l+'"/>'+"</button>"),u.append(f),a=o.getAttribute("aria-activedescendant"),a||(f.setAttribute("tabindex","0"),o.setAttribute("aria-activedescendant",f.generateID())),M.editor_atto.widgets[n]=n;var c=e.Node.create('<div class="atto_'+n+"_menu"+' atto_menu" data-editor="'+e.Escape.html(t)+'"></div>'),h=0,p={};for(h=0;h<s.length;h++)p=s[h],c.append(e.Node.create('<div class="atto_menuentry"><a href="#" class="atto_'+n+"_action_"+h+'" '+'data-editor="'+e.Escape.html(t)+'" '+'data-plugin="'+e.Escape.html(n)+'" '+'data-handler="'+e.Escape.html(n+"_action_"+h)+'">'+p.text+"</a>"+"</div>")),M.editor_atto.buttonhandlers[n+"_action_"+h]||(e.one("body").delegate("click",M.editor_atto.buttonclicked_handler,".atto_"+n+"_action_"+h),e.one("body").delegate("key",M.editor_atto.buttonclicked_handler,"space,enter",".atto_"+n+"_action_"+h),M.editor_atto.buttonhandlers[n+"_action_"+h]=p.handler);M.editor_atto.buttonhandlers[n]||(e.one("body").delegate("click",M.editor_atto.showhide_menu_handler,".atto_"+n+"_button"),M.editor_atto.buttonhandlers[n]=!0);var d=new M.core.dialogue({bodyContent:c,visible:!1,width:"14em",zindex:100,lightbox:!1,closeButton:!1,center:!1});M.editor_atto.menus[n+"_"+t]=d,d.render(),d.align(f,[e.WidgetPositionAlign.TL,e.WidgetPositionAlign.BL]),d.hide(),d.headerNode.hide()},add_toolbar_button:function(t,n,r,i,s){var o=e.one("#"+t+"_toolbar"),u=e.one("#"+t+"_toolbar .atto_group."+i+"_group"),a,f;u||(u=e.Node.create('<div class="atto_group '+i+'_group"></div>'),o.append(u)),a=e.Node.create('<button class="atto_'+n+'_button" '+'data-editor="'+e.Escape.html(t)+'" '+'data-plugin="'+e.Escape.html(n)+'" '+'tabindex="-1" '+'data-handler="'+e.Escape.html(n)+'" '+'title="'+e.Escape.html(M.util.get_string("pluginname","atto_"+n))+'">'+'<img class="icon" aria-hidden="true" role="presentation" width="16" height="16" src="'+r+'"/>'+"</button>"),u.append(a),f=o.getAttribute("aria-activedescendant"),f||(a.setAttribute("tabindex","0"),o.setAttribute("aria-activedescendant",a.generateID())),M.editor_atto.buttonhandlers[n]||(e.one("body").delegate("click",M.editor_atto.buttonclicked_handler,".atto_"+n+"_button"),M.editor_atto.buttonhandlers[n]=s),M.editor_atto.widgets[n]=n},is_active:function(t){var n=M.editor_atto.get_selection();n.length&&(n=n.pop());var r=null;return n.parentElement?r=e.one(n.parentElement()):r=e.one(n.startContainer),r&&r.ancestor("#"+t+"editable")!==null},focus:function(t){e.one("#"+t+"editable").focus()},init:function(t){var n=e.Node.create
+('<div class="'+CSS.WRAPPER+'" />'),r=e.Node.create('<div id="'+t.elementid+'editable" '+'contenteditable="true" '+'spellcheck="true" '+'class="'+CSS.CONTENT+'" />'),i="",s=e.Node.create('<div class="'+CSS.TOOLBAR+'" id="'+t.elementid+'_toolbar" role="toolbar"/>'),o=e.Node.create('<div class="'+CSS.CONTENTWRAPPER+'" />'),u=t.elementid.replace(":","\\:"),a=e.one("#"+u);o.appendChild(r),n.appendChild(s),n.appendChild(o);var f=e.io(t.content_css,{sync:!0}),l=f.responseText.indexOf("font:");l&&(i=f.responseText.substring(l+"font:".length,f.responseText.length-1),r.setStyle("font",i)),r.setStyle("minHeight",1.2*a.getAttribute("rows")+"em"),r.append(a.get("value")),r.cleanHTML(),a.get("parentNode").insert(n,a),r.setStyle("color",a.getStyle("color")),r.setStyle("lineHeight",a.getStyle("lineHeight")),r.setStyle("fontSize",a.getStyle("fontSize")),a.hide(),r.on("blur",function(){this.text_updated(u)},this),e.one(e.config.doc.body).delegate("key",this.keyboard_navigation,"down:37,39","#"+u+"_toolbar",this,u),M.editor_atto.filepickeroptions[u]=t.filepickeroptions;var c,h;for(c=0;c<t.plugins.length;c++){var p=t.plugins[c].group;for(h=0;h<t.plugins[c].plugins.length;h++){var d=t.plugins[c].plugins[h];d.params.elementid=u,d.params.group=p,M["atto_"+d.name].init(d.params)}}},text_updated:function(t){var n=e.one("#"+t),r=this.get_clean_html(t);n.set("value",r);var i=0;if(t in M.editor_atto.textupdatedhandlers)for(i=0;i<M.editor_atto.textupdatedhandlers[t].length;i++){var s=M.editor_atto.textupdatedhandlers[t][i];s(t)}},get_clean_html:function(t){var n=e.one("#"+t+"editable").cloneNode(!0);return e.each(n.all("[id]"),function(e){var t=e.get("id");t.indexOf("yui")===0&&e.removeAttribute("id")}),e.each(n.all(".atto_control"),function(e){e.remove(!0)}),n.cleanHTML(),n.getHTML()},keyboard_navigation:function(t,n){var r,i,s,o;t.preventDefault(),r=e.all("#"+n+"_toolbar button"),s=e.one("#"+n+"_toolbar").getAttribute("aria-activedescendant");if(!s)return;i=e.one("#"+s),i.setAttribute("tabindex","-1"),o=r.indexOf(i),t.keyCode===37?(o--,o<0&&(o=r.size()-1)):(o++,o>=r.size()&&(o=0)),i=r.item(o),i.setAttribute("tabindex","0"),i.focus(),e.one("#"+n+"_toolbar").setAttribute("aria-activedescendant",i.generateID())},can_show_filepicker:function(e,t){var n=M.editor_atto.filepickeroptions[e];return typeof n[t]!="undefined"},show_filepicker:function(t,n,r){e.use("core_filepicker",function(e){var i=M.editor_atto.filepickeroptions[t][n];i.formcallback=r,i.editor_target=e.one(t),M.core_filepicker.show(e,i)})},get_selection_from_node:function(e){var t;return window.getSelection?(t=document.createRange(),t.setStartBefore(e.getDOMNode()),t.setEndAfter(e.getDOMNode()),[t]):document.selection?(t=document.body.createTextRange(),t.moveToElementText(e.getDOMNode()),t):!1},get_selection:function(){if(window.getSelection){var e=window.getSelection(),t=[],n=0;for(n=0;n<e.rangeCount;n++)t.push(e.getRangeAt(n));return t}return document.selection&&document.selection.createRange?document.selection.createRange():!1},selection_contains_node:function(e){var t,n;if(window.getSelection){n=window.getSelection();if(n.containsNode)return n.containsNode(e.getDOMNode(),!0)}return n=document.selection.createRange(),t=n.duplicate(),t.moveToElementText(e.getDOMNode()),n.inRange(t)},get_selection_parent_node:function(){var e=M.editor_atto.get_selection();if(e.length>0)return e[0].commonAncestorContainer},get_selection_text:function(){var e=M.editor_atto.get_selection();if(e.length>0&&e[0].cloneContents)return e[0].cloneContents()},set_selection:function(e){var t,n;if(window.getSelection){t=window.getSelection(),t.removeAllRanges();for(n=0;n<e.length;n++)t.addRange(e[n])}else document.selection&&e.select&&e.select()}};var n="Controlmenu",r;r=function(e){e.draggable=!1,e.center=!1,e.width="auto",e.lightbox=!1,e.footerContent="",r.superclass.constructor.apply(this,[e])},e.extend(r,M.core.dialogue,{initializer:function(t){var n,i,s;r.superclass.initializer.call(this,t),s=this.get("boundingBox"),s.addClass("editor_atto_controlmenu"),n=this.bodyNode,i=e.Node.create("<h3/>"),i.addClass("accesshide"),i.setHTML(this.get("headerText")),n.prepend(i),n.on("clickoutside",function(e){this.get("visible")&&(e.target.ancestor(".atto_control")||(e.preventDefault(),this.hide()))},this)}},{NAME:n,ATTRS:{headerText:{value:""}}}),M.editor_atto=M.editor_atto||{},M.editor_atto.controlmenu=r,e.Node.addMethod("cleanHTML",i),e.NodeList.importMethod(e.Node.prototype,"cleanHTML")},"@VERSION@",{requires:["node","io","overlay","escape","event","moodle-core-notification"]});
diff --git a/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor.js b/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor.js
index b57dbf19741..47c967e0004 100644
--- a/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor.js
+++ b/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor.js
@@ -387,6 +387,9 @@ M.editor_atto = M.editor_atto || {
         // Copy text to editable div.
         atto.append(textarea.get('value'));
 
+        // Clean it.
+        atto.cleanHTML();
+
         // Add the toolbar and editable zone to the page.
         textarea.get('parentNode').insert(wrapper, textarea);
         atto.setStyle('color', textarea.getStyle('color'));
@@ -463,6 +466,9 @@ M.editor_atto = M.editor_atto || {
             node.remove(true);
         });
 
+        // Remove any and all nasties from source.
+        atto.cleanHTML();
+
         return atto.getHTML();
     },
 
@@ -719,6 +725,70 @@ Y.extend(CONTROLMENU, M.core.dialogue, {
 
 M.editor_atto = M.editor_atto || {};
 M.editor_atto.controlmenu = CONTROLMENU;
+/**
+ * Class for cleaning ugly HTML.
+ * Rewritten JS from jquery-clean plugin.
+ *
+ * @module editor_atto
+ * @chainable
+ */
+function cleanHTML() {
+    var cleaned = this.getHTML();
+
+    // What are we doing ?
+    // We are cleaning random HTML from all over the shop into a set of useful html suitable for content.
+    // We are allowing styles etc, but not e.g. font tags, class="MsoNormal" etc.
+
+    var rules = [
+        // Source: "http://stackoverflow.com/questions/2875027/clean-microsoft-word-pasted-text-using-javascript"
+        // Source: "http://stackoverflow.com/questions/1068280/javascript-regex-multiline-flag-doesnt-work"
+
+        // Remove all HTML comments.
+        {regex: /<!--[\s\S]*?-->/gi, replace: ""},
+        // Source: "http://www.1stclassmedia.co.uk/developers/clean-ms-word-formatting.php"
+        // Remove <?xml>, <\?xml>.
+        {regex: /<\\?\?xml[^>]*>/gi, replace: ""},
+        // Remove <o:blah>, <\o:blah>.
+        {regex: /<\/?\w+:[^>]*>/gi, replace: ""}, // e.g. <o:p...
+        // Remove MSO-blah, MSO:blah (e.g. in style attributes)
+        {regex: /\s*MSO[-:][^;"']*;?/gi, replace: ""},
+        // Remove empty spans
+        {regex: /<span[^>]*>(&nbsp;|\s)*<\/span>/gi, replace: ""},
+        // Remove class="Msoblah"
+        {regex: /class="Mso[^"]*"/gi, replace: ""},
+
+        // Source: "http://www.codinghorror.com/blog/2006/01/cleaning-words-nasty-html.html"
+        // Remove forbidden tags for content, title, meta, style, st0-9, head, font, html, body.
+        {regex: /<(\/?title|\/?meta|\/?style|\/?st\d|\/?head|\/?font|\/?html|\/?body|!\[)[^>]*?>/gi, replace: ""},
+
+        // Source: "http://www.tim-jarrett.com/labs_javascript_scrub_word.php"
+        // Replace extended chars with simple text.
+        {regex: new RegExp(String.fromCharCode(8220), 'gi'), replace: '"'},
+        {regex: new RegExp(String.fromCharCode(8216), 'gi'), replace: "'"},
+        {regex: new RegExp(String.fromCharCode(8217), 'gi'), replace: "'"},
+        {regex: new RegExp(String.fromCharCode(8211), 'gi'), replace: '-'},
+        {regex: new RegExp(String.fromCharCode(8212), 'gi'), replace: '--'},
+        {regex: new RegExp(String.fromCharCode(189), 'gi'), replace: '1/2'},
+        {regex: new RegExp(String.fromCharCode(188), 'gi'), replace: '1/4'},
+        {regex: new RegExp(String.fromCharCode(190), 'gi'), replace: '3/4'},
+        {regex: new RegExp(String.fromCharCode(169), 'gi'), replace: '(c)'},
+        {regex: new RegExp(String.fromCharCode(174), 'gi'), replace: '(r)'},
+        {regex: new RegExp(String.fromCharCode(8230), 'gi'), replace: '...'}
+    ];
+
+    var i = 0, rule;
+
+    for (i = 0; i < rules.length; i++) {
+        rule = rules[i];
+        cleaned = cleaned.replace(rule.regex, rule.replace);
+    }
+
+    this.setHTML(cleaned);
+    return this;
+}
+
+Y.Node.addMethod("cleanHTML", cleanHTML);
+Y.NodeList.importMethod(Y.Node.prototype, "cleanHTML");
 
 
 }, '@VERSION@', {"requires": ["node", "io", "overlay", "escape", "event", "moodle-core-notification"]});
diff --git a/lib/editor/atto/yui/src/editor/build.json b/lib/editor/atto/yui/src/editor/build.json
index 7925ae5d1d8..30fdf49942f 100644
--- a/lib/editor/atto/yui/src/editor/build.json
+++ b/lib/editor/atto/yui/src/editor/build.json
@@ -4,7 +4,8 @@
     "moodle-editor_atto-editor": {
       "jsfiles": [
         "editor.js",
-        "controlmenu.js"
+        "controlmenu.js",
+        "clean.js"
       ]
     }
   }
diff --git a/lib/editor/atto/yui/src/editor/js/clean.js b/lib/editor/atto/yui/src/editor/js/clean.js
new file mode 100644
index 00000000000..8f48b4471c2
--- /dev/null
+++ b/lib/editor/atto/yui/src/editor/js/clean.js
@@ -0,0 +1,64 @@
+/**
+ * Class for cleaning ugly HTML.
+ * Rewritten JS from jquery-clean plugin.
+ *
+ * @module editor_atto
+ * @chainable
+ */
+function cleanHTML() {
+    var cleaned = this.getHTML();
+
+    // What are we doing ?
+    // We are cleaning random HTML from all over the shop into a set of useful html suitable for content.
+    // We are allowing styles etc, but not e.g. font tags, class="MsoNormal" etc.
+
+    var rules = [
+        // Source: "http://stackoverflow.com/questions/2875027/clean-microsoft-word-pasted-text-using-javascript"
+        // Source: "http://stackoverflow.com/questions/1068280/javascript-regex-multiline-flag-doesnt-work"
+
+        // Remove all HTML comments.
+        {regex: /<!--[\s\S]*?-->/gi, replace: ""},
+        // Source: "http://www.1stclassmedia.co.uk/developers/clean-ms-word-formatting.php"
+        // Remove <?xml>, <\?xml>.
+        {regex: /<\\?\?xml[^>]*>/gi, replace: ""},
+        // Remove <o:blah>, <\o:blah>.
+        {regex: /<\/?\w+:[^>]*>/gi, replace: ""}, // e.g. <o:p...
+        // Remove MSO-blah, MSO:blah (e.g. in style attributes)
+        {regex: /\s*MSO[-:][^;"']*;?/gi, replace: ""},
+        // Remove empty spans
+        {regex: /<span[^>]*>(&nbsp;|\s)*<\/span>/gi, replace: ""},
+        // Remove class="Msoblah"
+        {regex: /class="Mso[^"]*"/gi, replace: ""},
+
+        // Source: "http://www.codinghorror.com/blog/2006/01/cleaning-words-nasty-html.html"
+        // Remove forbidden tags for content, title, meta, style, st0-9, head, font, html, body.
+        {regex: /<(\/?title|\/?meta|\/?style|\/?st\d|\/?head|\/?font|\/?html|\/?body|!\[)[^>]*?>/gi, replace: ""},
+
+        // Source: "http://www.tim-jarrett.com/labs_javascript_scrub_word.php"
+        // Replace extended chars with simple text.
+        {regex: new RegExp(String.fromCharCode(8220), 'gi'), replace: '"'},
+        {regex: new RegExp(String.fromCharCode(8216), 'gi'), replace: "'"},
+        {regex: new RegExp(String.fromCharCode(8217), 'gi'), replace: "'"},
+        {regex: new RegExp(String.fromCharCode(8211), 'gi'), replace: '-'},
+        {regex: new RegExp(String.fromCharCode(8212), 'gi'), replace: '--'},
+        {regex: new RegExp(String.fromCharCode(189), 'gi'), replace: '1/2'},
+        {regex: new RegExp(String.fromCharCode(188), 'gi'), replace: '1/4'},
+        {regex: new RegExp(String.fromCharCode(190), 'gi'), replace: '3/4'},
+        {regex: new RegExp(String.fromCharCode(169), 'gi'), replace: '(c)'},
+        {regex: new RegExp(String.fromCharCode(174), 'gi'), replace: '(r)'},
+        {regex: new RegExp(String.fromCharCode(8230), 'gi'), replace: '...'}
+    ];
+
+    var i = 0, rule;
+
+    for (i = 0; i < rules.length; i++) {
+        rule = rules[i];
+        cleaned = cleaned.replace(rule.regex, rule.replace);
+    }
+
+    this.setHTML(cleaned);
+    return this;
+}
+
+Y.Node.addMethod("cleanHTML", cleanHTML);
+Y.NodeList.importMethod(Y.Node.prototype, "cleanHTML");
diff --git a/lib/editor/atto/yui/src/editor/js/editor.js b/lib/editor/atto/yui/src/editor/js/editor.js
index 6c6d8aef783..5745a20f5b0 100644
--- a/lib/editor/atto/yui/src/editor/js/editor.js
+++ b/lib/editor/atto/yui/src/editor/js/editor.js
@@ -385,6 +385,9 @@ M.editor_atto = M.editor_atto || {
         // Copy text to editable div.
         atto.append(textarea.get('value'));
 
+        // Clean it.
+        atto.cleanHTML();
+
         // Add the toolbar and editable zone to the page.
         textarea.get('parentNode').insert(wrapper, textarea);
         atto.setStyle('color', textarea.getStyle('color'));
@@ -461,6 +464,9 @@ M.editor_atto = M.editor_atto || {
             node.remove(true);
         });
 
+        // Remove any and all nasties from source.
+        atto.cleanHTML();
+
         return atto.getHTML();
     },