diff --git a/lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-debug.js b/lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-debug.js
index 6e9752ffc49..bed9c394068 100644
--- a/lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-debug.js
+++ b/lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-debug.js
@@ -243,6 +243,7 @@ Y.namespace('M.atto_image').Button = Y.Base.create('button', Y.M.editor_atto.Edi
         });
         this.editor.delegate('dblclick', this._displayDialogue, 'img', this);
         this.editor.delegate('click', this._handleClick, 'img', this);
+        this.editor.on('paste', this._handlePaste, this);
         this.editor.on('drop', this._handleDragDrop, this);
 
         // e.preventDefault needed to stop the default event from clobbering the desired behaviour in some browsers.
@@ -259,118 +260,189 @@ Y.namespace('M.atto_image').Button = Y.Base.create('button', Y.M.editor_atto.Edi
      *
      * @method _handleDragDrop
      * @param {EventFacade} e
-     * @return mixed
+     * @return {boolean} false if we handled the event, else true.
      * @private
      */
     _handleDragDrop: function(e) {
+        if (!e._event || !e._event.dataTransfer) {
+            // Drop not fully supported in this browser.
+            return true;
+        }
+
+        return this._handlePasteOrDropHelper(e, e._event.dataTransfer);
+    },
+
+    /**
+     * Handles paste events where - if the thing being pasted is an image.
+     *
+     * @method _handlePaste
+     * @param {EventFacade} e
+     * @return {boolean} false if we handled the event, else true.
+     * @private
+     */
+    _handlePaste: function(e) {
+        if (!e._event || !e._event.clipboardData) {
+            // Paste not fully supported in this browser.
+            return true;
+        }
+
+        return this._handlePasteOrDropHelper(e, e._event.clipboardData);
+    },
+
+    /**
+     * Handle a drag and drop event with an image.
+     *
+     * @method _handleDragDrop
+     * @param {EventFacade} e
+     * @param {DataTransfer} dataTransfer
+     * @return {boolean} false if we handled the event, else true.
+     * @private
+     */
+    _handlePasteOrDropHelper: function(e, dataTransfer) {
+
+        var items = dataTransfer.items,
+            didUpload = false;
+        for (var i = 0; i < items.length; i++) {
+            var item = items[i];
+            if (item.kind !== 'file') {
+                continue;
+            }
+            if (!this._isImage(item.type)) {
+                continue;
+            }
+            this._uploadImage(item.getAsFile());
+            didUpload = true;
+        }
+
+        if (didUpload) {
+            // We handled this.
+            e.preventDefault();
+            e.stopPropagation();
+            return false;
+        } else {
+            // Let someone else try to handle it.
+            return true;
+        }
+    },
+
+    /**
+     * Is this file an image?
+     *
+     * @method _isImage
+     * @param {string} mimeType the file's mime type.
+     * @return {boolean} true if the file has an image mimeType.
+     * @private
+     */
+    _isImage: function(mimeType) {
+        return mimeType.indexOf('image/') === 0;
+    },
+
+    /**
+     * Used by _handleDragDrop and _handlePaste to upload an image and insert it.
+     *
+     * @method _uploadImage
+     * @param {File} fileToSave
+     * @private
+     */
+    _uploadImage: function(fileToSave) {
 
         var self = this,
             host = this.get('host'),
             template = Y.Handlebars.compile(IMAGETEMPLATE);
 
         host.saveSelection();
-        e = e._event;
 
-        // Only handle the event if an image file was dropped in.
-        var handlesDataTransfer = (e.dataTransfer && e.dataTransfer.files && e.dataTransfer.files.length);
-        if (handlesDataTransfer && /^image\//.test(e.dataTransfer.files[0].type)) {
+        var options = host.get('filepickeroptions').image,
+            savepath = (options.savepath === undefined) ? '/' : options.savepath,
+            formData = new FormData(),
+            timestamp = 0,
+            uploadid = "",
+            xhr = new XMLHttpRequest(),
+            imagehtml = "",
+            keys = Object.keys(options.repositories);
 
-            var options = host.get('filepickeroptions').image,
-                savepath = (options.savepath === undefined) ? '/' : options.savepath,
-                formData = new FormData(),
-                timestamp = 0,
-                uploadid = "",
-                xhr = new XMLHttpRequest(),
-                imagehtml = "",
-                keys = Object.keys(options.repositories);
+        formData.append('repo_upload_file', fileToSave);
+        formData.append('itemid', options.itemid);
 
-            e.preventDefault();
-            e.stopPropagation();
-            formData.append('repo_upload_file', e.dataTransfer.files[0]);
-            formData.append('itemid', options.itemid);
-
-            // List of repositories is an object rather than an array.  This makes iteration more awkward.
-            for (var i = 0; i < keys.length; i++) {
-                if (options.repositories[keys[i]].type === 'upload') {
-                    formData.append('repo_id', options.repositories[keys[i]].id);
-                    break;
-                }
+        // List of repositories is an object rather than an array.  This makes iteration more awkward.
+        for (var i = 0; i < keys.length; i++) {
+            if (options.repositories[keys[i]].type === 'upload') {
+                formData.append('repo_id', options.repositories[keys[i]].id);
+                break;
             }
-            formData.append('env', options.env);
-            formData.append('sesskey', M.cfg.sesskey);
-            formData.append('client_id', options.client_id);
-            formData.append('savepath', savepath);
-            formData.append('ctx_id', options.context.id);
+        }
+        formData.append('env', options.env);
+        formData.append('sesskey', M.cfg.sesskey);
+        formData.append('client_id', options.client_id);
+        formData.append('savepath', savepath);
+        formData.append('ctx_id', options.context.id);
 
-            // Insert spinner as a placeholder.
-            timestamp = new Date().getTime();
-            uploadid = 'moodleimage_' + Math.round(Math.random() * 100000) + '-' + timestamp;
-            host.focus();
-            host.restoreSelection();
-            imagehtml = template({
-                url: M.util.image_url("i/loading_small", 'moodle'),
-                alt: M.util.get_string('uploading', COMPONENTNAME),
-                id: uploadid
-            });
-            host.insertContentAtFocusPoint(imagehtml);
-            self.markUpdated();
+        // Insert spinner as a placeholder.
+        timestamp = new Date().getTime();
+        uploadid = 'moodleimage_' + Math.round(Math.random() * 100000) + '-' + timestamp;
+        host.focus();
+        host.restoreSelection();
+        imagehtml = template({
+            url: M.util.image_url("i/loading_small", 'moodle'),
+            alt: M.util.get_string('uploading', COMPONENTNAME),
+            id: uploadid
+        });
+        host.insertContentAtFocusPoint(imagehtml);
+        self.markUpdated();
 
-            // Kick off a XMLHttpRequest.
-            xhr.onreadystatechange = function() {
-                var placeholder = self.editor.one('#' + uploadid),
-                    result,
-                    file,
-                    newhtml,
-                    newimage;
+        // Kick off a XMLHttpRequest.
+        xhr.onreadystatechange = function() {
+            var placeholder = self.editor.one('#' + uploadid),
+                result,
+                file,
+                newhtml,
+                newimage;
 
-                if (xhr.readyState === 4) {
-                    if (xhr.status === 200) {
-                        result = JSON.parse(xhr.responseText);
-                        if (result) {
-                            if (result.error) {
-                                if (placeholder) {
-                                    placeholder.remove(true);
-                                }
-                                return new M.core.ajaxException(result);
-                            }
-
-                            file = result;
-                            if (result.event && result.event === 'fileexists') {
-                                // A file with this name is already in use here - rename to avoid conflict.
-                                // Chances are, it's a different image (stored in a different folder on the user's computer).
-                                // If the user wants to reuse an existing image, they can copy/paste it within the editor.
-                                file = result.newfile;
-                            }
-
-                            // Replace placeholder with actual image.
-                            newhtml = template({
-                                url: file.url,
-                                presentation: true
-                            });
-                            newimage = Y.Node.create(newhtml);
+            if (xhr.readyState === 4) {
+                if (xhr.status === 200) {
+                    result = JSON.parse(xhr.responseText);
+                    if (result) {
+                        if (result.error) {
                             if (placeholder) {
-                                placeholder.replace(newimage);
-                            } else {
-                                self.editor.appendChild(newimage);
+                                placeholder.remove(true);
                             }
-                            self.markUpdated();
+                            throw new M.core.ajaxException(result);
                         }
-                    } else {
-                        Y.use('moodle-core-notification-alert', function() {
-                            new M.core.alert({message: M.util.get_string('servererror', 'moodle')});
+
+                        file = result;
+                        if (result.event && result.event === 'fileexists') {
+                            // A file with this name is already in use here - rename to avoid conflict.
+                            // Chances are, it's a different image (stored in a different folder on the user's computer).
+                            // If the user wants to reuse an existing image, they can copy/paste it within the editor.
+                            file = result.newfile;
+                        }
+
+                        // Replace placeholder with actual image.
+                        newhtml = template({
+                            url: file.url,
+                            presentation: true
                         });
+                        newimage = Y.Node.create(newhtml);
                         if (placeholder) {
-                            placeholder.remove(true);
+                            placeholder.replace(newimage);
+                        } else {
+                            self.editor.appendChild(newimage);
                         }
+                        self.markUpdated();
+                    }
+                } else {
+                    Y.use('moodle-core-notification-alert', function() {
+                        new M.core.alert({message: M.util.get_string('servererror', 'moodle')});
+                    });
+                    if (placeholder) {
+                        placeholder.remove(true);
                     }
                 }
-            };
-            xhr.open("POST", M.cfg.wwwroot + '/repository/repository_ajax.php?action=upload', true);
-            xhr.send(formData);
-            return false;
-        }
-
-},
+            }
+        };
+        xhr.open("POST", M.cfg.wwwroot + '/repository/repository_ajax.php?action=upload', true);
+        xhr.send(formData);
+    },
 
     /**
      * Handle a click on an image.
diff --git a/lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-min.js b/lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-min.js
index 94511b8d106..fea59fe97ef 100644
--- a/lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-min.js
+++ b/lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-min.js
@@ -1,3 +1,3 @@
-YUI.add("moodle-atto_image-button",function(e,t){var n={RESPONSIVE:"img-responsive",INPUTALIGNMENT:"atto_image_alignment",INPUTALT:"atto_image_altentry",INPUTHEIGHT:"atto_image_heightentry",INPUTSUBMIT:"atto_image_urlentrysubmit",INPUTURL:"atto_image_urlentry",INPUTSIZE:"atto_image_size",INPUTWIDTH:"atto_image_widthentry",IMAGEALTWARNING:"atto_image_altwarning",IMAGEBROWSER:"openimagebrowser",IMAGEPRESENTATION:"atto_image_presentation",INPUTCONSTRAIN:"atto_image_constrain",INPUTCUSTOMSTYLE:"atto_image_customstyle",IMAGEPREVIEW:"atto_image_preview",IMAGEPREVIEWBOX:"atto_image_preview_box",ALIGNSETTINGS:"atto_image_button"},r={INPUTURL:"."+n.INPUTURL},i=[{name:"verticalAlign",str:"alignment_top",value:"text-top",margin:"0 0.5em"},{name:"verticalAlign",str:"alignment_middle",value:"middle",margin:"0 0.5em"},{name:"verticalAlign",str:"alignment_bottom",value:"text-bottom",margin:"0 0.5em",isDefault:!0},{name:"float",str:"alignment_left",value:"left",margin:"0 0.5em 0 0"},{name:"float",str:"alignment_right",value:"right",margin:"0 0 0 0.5em"}],s={ISPERCENT:/\d+%/},o="atto_image",u='<form class="atto_form">{{#if showFilepicker}}<div class="mb-1"><label for="{{elementid}}_{{CSS.INPUTURL}}">{{get_string "enterurl" component}}</label><div class="input-group input-append w-100"><input class="form-control {{CSS.INPUTURL}}" type="url" id="{{elementid}}_{{CSS.INPUTURL}}" size="32"/><span class="input-group-append"><button class="btn btn-secondary {{CSS.IMAGEBROWSER}}" type="button">{{get_string "browserepositories" component}}</button></span></div></div>{{else}}<div class="mb-1"><label for="{{elementid}}_{{CSS.INPUTURL}}">{{get_string "enterurl" component}}</label><input class="form-control fullwidth {{CSS.INPUTURL}}" type="url" id="{{elementid}}_{{CSS.INPUTURL}}" size="32"/></div>{{/if}}<div style="display:none" role="alert" class="alert alert-warning mb-1 {{CSS.IMAGEALTWARNING}}">{{get_string "presentationoraltrequired" component}}</div><div class="mb-1"><label for="{{elementid}}_{{CSS.INPUTALT}}">{{get_string "enteralt" component}}</label><input class="form-control fullwidth {{CSS.INPUTALT}}" type="text" value="" id="{{elementid}}_{{CSS.INPUTALT}}" size="32"/><div class="form-check"><input type="checkbox" class="form-check-input {{CSS.IMAGEPRESENTATION}}" id="{{elementid}}_{{CSS.IMAGEPRESENTATION}}"/><label class="form-check-label" for="{{elementid}}_{{CSS.IMAGEPRESENTATION}}">{{get_string "presentation" component}}</label></div></div><div class="mb-1"><label class="" for="{{elementid}}_{{CSS.INPUTSIZE}}">{{get_string "size" component}}</label><div id="{{elementid}}_{{CSS.INPUTSIZE}}" class="form-inline {{CSS.INPUTSIZE}}"><label class="accesshide" for="{{elementid}}_{{CSS.INPUTWIDTH}}">{{get_string "width" component}}</label><input type="text" class="form-control mr-1 input-mini {{CSS.INPUTWIDTH}}" id="{{elementid}}_{{CSS.INPUTWIDTH}}" size="4"/> x<label class="accesshide" for="{{elementid}}_{{CSS.INPUTHEIGHT}}">{{get_string "height" component}}</label><input type="text" class="form-control ml-1 input-mini {{CSS.INPUTHEIGHT}}" id="{{elementid}}_{{CSS.INPUTHEIGHT}}" size="4"/><div class="form-check ml-2"><input type="checkbox" class="form-check-input {{CSS.INPUTCONSTRAIN}}" id="{{elementid}}_{{CSS.INPUTCONSTRAIN}}"/><label class="form-check-label" for="{{elementid}}_{{CSS.INPUTCONSTRAIN}}">{{get_string "constrain" component}}</label></div></div></div><div class="form-inline mb-1"><label class="for="{{elementid}}_{{CSS.INPUTALIGNMENT}}">{{get_string "alignment" component}}</label><select class="custom-select {{CSS.INPUTALIGNMENT}}" id="{{elementid}}_{{CSS.INPUTALIGNMENT}}">{{#each alignments}}<option value="{{value}}">{{get_string str ../component}}</option>{{/each}}</select></div><input type="hidden" class="{{CSS.INPUTCUSTOMSTYLE}}"/><br/><div class="mdl-align"><div class="{{CSS.IMAGEPREVIEWBOX}}"><img src="#" class="{{CSS.IMAGEPREVIEW}}" alt="" style="display: none;"/></div><button class="btn btn-secondary {{CSS.INPUTSUBMIT}}" type="submit">{{get_string "saveimage" component}}</button></div></form>',a='<img src="{{url}}" alt="{{alt}}" {{#if width}}width="{{width}}" {{/if}}{{#if height}}height="{{height}}" {{/if}}{{#if presentation}}role="presentation" {{/if}}{{#if customstyle}}style="{{customstyle}}" {{/if}}{{#if classlist}}class="{{classlist}}" {{/if}}{{#if id}}id="{{id}}" {{/if}}/>';e.namespace("M.atto_image").Button=e.Base.create("button",e.M.editor_atto.EditorPlugin,[],{_currentSelection:null,_selectedImage:null,_form:null,_rawImageDimensions:null,initializer:function(){this.addButton({icon:"e/insert_edit_image",callback:this._displayDialogue,tags:"img",tagMatchRequiresAll:!1}),this.editor.delegate("dblclick",this._displayDialogue,"img",this),this.editor.delegate("click",this._handleClick,"img",this),this.editor.on("drop",this._handleDragDrop,this),this.editor.on("dragover",function(e){e.preventDefault()},this),this.editor.on("dragenter",function(e){e.preventDefault()},this)},_handleDragDrop:function(t){var n=this,r=this.get("host"),i=e.Handlebars.compile(a);r.saveSelection(),t=t._event;var s=t.dataTransfer&&t.dataTransfer.files&&t.dataTransfer.files.length;if(s&&/^image\//.test(t.dataTransfer.files[0].type)){var u=r.get("filepickeroptions").image,f=u.savepath===undefined?"/":u.savepath,l=new FormData,c=0,h="",p=new XMLHttpRequest,d="",v=Object.keys(u.repositories);t.preventDefault(),t.stopPropagation(),l.append("repo_upload_file",t.dataTransfer.files[0]),l.append("itemid",u.itemid);for(var m=0;m<v.length;m++)if(u.repositories[v[m]].type==="upload"){l.append("repo_id",u.repositories[v[m]].id);break}return l.append("env",u.env),l.append("sesskey",M.cfg.sesskey),l.append("client_id",u.client_id),l.append("savepath",f),l.append("ctx_id",u.context.id),c=(new Date).getTime(),h="moodleimage_"+Math.round(Math.random()*1e5)+"-"+c,r.focus(),r.restoreSelection(),d=i({url:M.util.image_url("i/loading_small","moodle"),alt:M.util.get_string("uploading",o),id:h}),r.insertContentAtFocusPoint(d),n.markUpdated()
-,p.onreadystatechange=function(){var t=n.editor.one("#"+h),r,s,o,u;if(p.readyState===4)if(p.status===200){r=JSON.parse(p.responseText);if(r){if(r.error)return t&&t.remove(!0),new M.core.ajaxException(r);s=r,r.event&&r.event==="fileexists"&&(s=r.newfile),o=i({url:s.url,presentation:!0}),u=e.Node.create(o),t?t.replace(u):n.editor.appendChild(u),n.markUpdated()}}else e.use("moodle-core-notification-alert",function(){new M.core.alert({message:M.util.get_string("servererror","moodle")})}),t&&t.remove(!0)},p.open("POST",M.cfg.wwwroot+"/repository/repository_ajax.php?action=upload",!0),p.send(l),!1}},_handleClick:function(e){var t=e.target,n=this.get("host").getSelectionFromNode(t);this.get("host").getSelection()!==n&&this.get("host").setSelection(n)},_displayDialogue:function(){this._currentSelection=this.get("host").getSelection();if(this._currentSelection===!1)return;this._rawImageDimensions=null;var e=this.getDialogue({headerContent:M.util.get_string("imageproperties",o),width:"auto",focusAfterHide:!0,focusOnShowSelector:r.INPUTURL});e.set("bodyContent",this._getDialogueContent()).show()},_loadPreviewImage:function(e){var t=new Image,r=this;t.onerror=function(){var e=r._form.one("."+n.IMAGEPREVIEW);e.setStyles({display:"none"}),r.getDialogue().centerDialogue()},t.onload=function(){var e,t,i,o,u;r._rawImageDimensions={width:this.width,height:this.height},e=r._form.one("."+n.INPUTWIDTH),t=e.get("value"),t===""&&(e.set("value",this.width),t=""+this.width),e=r._form.one("."+n.INPUTHEIGHT),i=e.get("value"),i===""&&(e.set("value",this.height),i=""+this.height),e=r._form.one("."+n.IMAGEPREVIEW),e.setAttribute("src",this.src),e.setStyles({display:"inline"}),e=r._form.one("."+n.INPUTCONSTRAIN),t.match(s.ISPERCENT)&&i.match(s.ISPERCENT)?e.set("checked",t===i):(this.width===0&&(this.width=1),this.height===0&&(this.height=1),o=Math.round(1e3*parseInt(t,10)/this.width),u=Math.round(1e3*parseInt(i,10)/this.height),e.set("checked",o===u)),r._autoAdjustSize(r),r.getDialogue().centerDialogue()},t.src=e},_getDialogueContent:function(){var t=e.Handlebars.compile(u),r=this.get("host").canShowFilepicker("image"),s=e.Node.create(t({elementid:this.get("host").get("elementid"),CSS:n,component:o,showFilepicker:r,alignments:i}));return this._form=s,this._applyImageProperties(this._form),this._form.one("."+n.INPUTURL).on("blur",this._urlChanged,this),this._form.one("."+n.IMAGEPRESENTATION).on("change",this._updateWarning,this),this._form.one("."+n.INPUTALT).on("change",this._updateWarning,this),this._form.one("."+n.INPUTWIDTH).on("blur",this._autoAdjustSize,this),this._form.one("."+n.INPUTHEIGHT).on("blur",this._autoAdjustSize,this,!0),this._form.one("."+n.INPUTCONSTRAIN).on("change",function(e){e.target.get("checked")&&this._autoAdjustSize(e)},this),this._form.one("."+n.INPUTURL).on("blur",this._urlChanged,this),this._form.one("."+n.INPUTSUBMIT).on("click",this._setImage,this),r&&this._form.one("."+n.IMAGEBROWSER).on("click",function(){this.get("host").showFilepicker("image",this._filepickerCallback,this)},this),s},_autoAdjustSize:function(e,t){t=t||!1;var r=this._form.one("."+n.INPUTWIDTH),i="width",o=this._form.one("."+n.INPUTHEIGHT),u="height",a=this._form.one("."+n.INPUTCONSTRAIN),f=r.get("value"),l=o.get("value"),c=this._form.one("."+n.IMAGEPREVIEW),h,p;if(!this._rawImageDimensions)return;f===""&&(f=this._rawImageDimensions[i],r.set("value",f),f=r.get("value")),c.setStyles({width:null,height:null});if(!a.get("checked"))f.match(s.ISPERCENT)?(h=parseInt(f,10),p=this._rawImageDimensions.width/100*h,c.setStyle("width",p+"px")):c.setStyle("width",f+"px"),l.match(s.ISPERCENT)?(h=parseInt(l,10),p=this._rawImageDimensions.height/100*h,c.setStyle("height",p+"px")):c.setStyle("height",l+"px");else{if(t){var d;d=r,r=o,o=d,d=i,i=u,u=d,d=f,f=l,l=d}f.match(s.ISPERCENT)?(l=f,h=parseInt(f,10),p=this._rawImageDimensions.width/100*h,c.setStyle("width",p),p=this._rawImageDimensions.height/100*h,c.setStyle("height",p)):(l=Math.round(f/this._rawImageDimensions[i]*this._rawImageDimensions[u]),t?c.setStyles({width:l,height:f}):c.setStyles({width:f,height:l})),o.set("value",l)}},_filepickerCallback:function(e){if(e.url!==""){var t=this._form.one("."+n.INPUTURL);t.set("value",e.url),this._form.one("."+n.INPUTWIDTH).set("value",""),this._form.one("."+n.INPUTHEIGHT).set("value",""),this._loadPreviewImage(e.url)}},_applyImageProperties:function(e){var t=this._getSelectedImageProperties(),r=e.one("."+n.IMAGEPREVIEW);if(t===!1){r.setStyle("display","none"),i.some(function(t){return t.isDefault?(e.one("."+n.INPUTALIGNMENT).set("value",t.value),!0):!1},this);return}t.align&&e.one("."+n.INPUTALIGNMENT).set("value",t.align),t.customstyle&&e.one("."+n.INPUTCUSTOMSTYLE).set("value",t.customstyle),t.width&&e.one("."+n.INPUTWIDTH).set("value",t.width),t.height&&e.one("."+n.INPUTHEIGHT).set("value",t.height),t.alt&&e.one("."+n.INPUTALT).set("value",t.alt),t.src&&(e.one("."+n.INPUTURL).set("value",t.src),this._loadPreviewImage(t.src)),t.presentation&&e.one("."+n.IMAGEPRESENTATION).set("checked","checked"),this._autoAdjustSize()},_getSelectedImageProperties:function(){var e={src:null,alt:null,width:null,height:null,align:"",presentation:!1},t=this.get("host").getSelectedNodes(),n,r,i,o;return t&&(t=t.filter("img")),t&&t.size()?(o=this._removeLegacyAlignment(t.item(0)),this._selectedImage=o,i=o.getAttribute("style"),e.customstyle=i,n=o.getAttribute("width"),n.match(s.ISPERCENT)||(n=parseInt(n,10)),r=o.getAttribute("height"),r.match(s.ISPERCENT)||(r=parseInt(r,10)),n!==0&&(e.width=n),r!==0&&(e.height=r),this._getAlignmentPropeties(o,e),e.src=o.getAttribute("src"),e.alt=o.getAttribute("alt")||"",e.presentation=o.get("role")==="presentation",e):(this._selectedImage=null,!1)},_getAlignmentPropeties:function(e,t){var n=!1,r;n=i.some(function(n){var i=this._getAlignmentClass(n.value);return e.hasClass(i)?(t.align=n.value,!0):(n.isDefault&&(r=n.value),!1)},this),!n&&r&&(t.align=r)},_urlChanged:function(){var e=this._form.one("."+n.INPUTURL);e.get("value")!==""&&
-this._loadPreviewImage(e.get("value"))},_setImage:function(t){var r=this._form,i=r.one("."+n.INPUTURL).get("value"),o=r.one("."+n.INPUTALT).get("value"),u=r.one("."+n.INPUTWIDTH).get("value"),f=r.one("."+n.INPUTHEIGHT).get("value"),l=this._getAlignmentClass(r.one("."+n.INPUTALIGNMENT).get("value")),c=r.one("."+n.IMAGEPRESENTATION).get("checked"),h=r.one("."+n.INPUTCONSTRAIN).get("checked"),p,d=r.one("."+n.INPUTCUSTOMSTYLE).get("value"),v=[],m=this.get("host");t.preventDefault();if(this._updateWarning())return;m.focus();if(i!==""){this._selectedImage?m.setSelection(m.getSelectionFromNode(this._selectedImage)):m.setSelection(this._currentSelection),h&&v.push(n.RESPONSIVE),v.push(l);if(!u.match(s.ISPERCENT)&&isNaN(parseInt(u,10))){r.one("."+n.INPUTWIDTH).focus();return}if(!f.match(s.ISPERCENT)&&isNaN(parseInt(f,10))){r.one("."+n.INPUTHEIGHT).focus();return}var g=e.Handlebars.compile(a);p=g({url:i,alt:o,width:u,height:f,presentation:c,customstyle:d,classlist:v.join(" ")}),this.get("host").insertContentAtFocusPoint(p),this.markUpdated()}this.getDialogue({focusAfterHide:null}).hide()},_removeLegacyAlignment:function(t){return t.getStyle("margin")?(i.some(function(n){if(t.getStyle(n.name)!==n.value)return!1;var r=e.Node.create("<div>");return r.setStyle("margin",n.margin),t.getStyle("margin")!==r.getStyle("margin")?!1:(t.addClass(this._getAlignmentClass(n.value)),t.setStyle(n.name,null),t.setStyle("margin",null),!0)},this),t):t},_getAlignmentClass:function(e){return n.ALIGNSETTINGS+"_"+e},_updateWarning:function(){var e=this._form,t=!0,r=e.one("."+n.INPUTALT).get("value"),i=e.one("."+n.IMAGEPRESENTATION).get("checked");return r===""&&!i?(e.one("."+n.IMAGEALTWARNING).setStyle("display","block"),e.one("."+n.INPUTALT).setAttribute("aria-invalid",!0),e.one("."+n.IMAGEPRESENTATION).setAttribute("aria-invalid",!0),t=!0):(e.one("."+n.IMAGEALTWARNING).setStyle("display","none"),e.one("."+n.INPUTALT).setAttribute("aria-invalid",!1),e.one("."+n.IMAGEPRESENTATION).setAttribute("aria-invalid",!1),t=!1),this.getDialogue().centerDialogue(),t}})},"@VERSION@",{requires:["moodle-editor_atto-plugin"]});
+YUI.add("moodle-atto_image-button",function(e,t){var n={RESPONSIVE:"img-responsive",INPUTALIGNMENT:"atto_image_alignment",INPUTALT:"atto_image_altentry",INPUTHEIGHT:"atto_image_heightentry",INPUTSUBMIT:"atto_image_urlentrysubmit",INPUTURL:"atto_image_urlentry",INPUTSIZE:"atto_image_size",INPUTWIDTH:"atto_image_widthentry",IMAGEALTWARNING:"atto_image_altwarning",IMAGEBROWSER:"openimagebrowser",IMAGEPRESENTATION:"atto_image_presentation",INPUTCONSTRAIN:"atto_image_constrain",INPUTCUSTOMSTYLE:"atto_image_customstyle",IMAGEPREVIEW:"atto_image_preview",IMAGEPREVIEWBOX:"atto_image_preview_box",ALIGNSETTINGS:"atto_image_button"},r={INPUTURL:"."+n.INPUTURL},i=[{name:"verticalAlign",str:"alignment_top",value:"text-top",margin:"0 0.5em"},{name:"verticalAlign",str:"alignment_middle",value:"middle",margin:"0 0.5em"},{name:"verticalAlign",str:"alignment_bottom",value:"text-bottom",margin:"0 0.5em",isDefault:!0},{name:"float",str:"alignment_left",value:"left",margin:"0 0.5em 0 0"},{name:"float",str:"alignment_right",value:"right",margin:"0 0 0 0.5em"}],s={ISPERCENT:/\d+%/},o="atto_image",u='<form class="atto_form">{{#if showFilepicker}}<div class="mb-1"><label for="{{elementid}}_{{CSS.INPUTURL}}">{{get_string "enterurl" component}}</label><div class="input-group input-append w-100"><input class="form-control {{CSS.INPUTURL}}" type="url" id="{{elementid}}_{{CSS.INPUTURL}}" size="32"/><span class="input-group-append"><button class="btn btn-secondary {{CSS.IMAGEBROWSER}}" type="button">{{get_string "browserepositories" component}}</button></span></div></div>{{else}}<div class="mb-1"><label for="{{elementid}}_{{CSS.INPUTURL}}">{{get_string "enterurl" component}}</label><input class="form-control fullwidth {{CSS.INPUTURL}}" type="url" id="{{elementid}}_{{CSS.INPUTURL}}" size="32"/></div>{{/if}}<div style="display:none" role="alert" class="alert alert-warning mb-1 {{CSS.IMAGEALTWARNING}}">{{get_string "presentationoraltrequired" component}}</div><div class="mb-1"><label for="{{elementid}}_{{CSS.INPUTALT}}">{{get_string "enteralt" component}}</label><input class="form-control fullwidth {{CSS.INPUTALT}}" type="text" value="" id="{{elementid}}_{{CSS.INPUTALT}}" size="32"/><div class="form-check"><input type="checkbox" class="form-check-input {{CSS.IMAGEPRESENTATION}}" id="{{elementid}}_{{CSS.IMAGEPRESENTATION}}"/><label class="form-check-label" for="{{elementid}}_{{CSS.IMAGEPRESENTATION}}">{{get_string "presentation" component}}</label></div></div><div class="mb-1"><label class="" for="{{elementid}}_{{CSS.INPUTSIZE}}">{{get_string "size" component}}</label><div id="{{elementid}}_{{CSS.INPUTSIZE}}" class="form-inline {{CSS.INPUTSIZE}}"><label class="accesshide" for="{{elementid}}_{{CSS.INPUTWIDTH}}">{{get_string "width" component}}</label><input type="text" class="form-control mr-1 input-mini {{CSS.INPUTWIDTH}}" id="{{elementid}}_{{CSS.INPUTWIDTH}}" size="4"/> x<label class="accesshide" for="{{elementid}}_{{CSS.INPUTHEIGHT}}">{{get_string "height" component}}</label><input type="text" class="form-control ml-1 input-mini {{CSS.INPUTHEIGHT}}" id="{{elementid}}_{{CSS.INPUTHEIGHT}}" size="4"/><div class="form-check ml-2"><input type="checkbox" class="form-check-input {{CSS.INPUTCONSTRAIN}}" id="{{elementid}}_{{CSS.INPUTCONSTRAIN}}"/><label class="form-check-label" for="{{elementid}}_{{CSS.INPUTCONSTRAIN}}">{{get_string "constrain" component}}</label></div></div></div><div class="form-inline mb-1"><label class="for="{{elementid}}_{{CSS.INPUTALIGNMENT}}">{{get_string "alignment" component}}</label><select class="custom-select {{CSS.INPUTALIGNMENT}}" id="{{elementid}}_{{CSS.INPUTALIGNMENT}}">{{#each alignments}}<option value="{{value}}">{{get_string str ../component}}</option>{{/each}}</select></div><input type="hidden" class="{{CSS.INPUTCUSTOMSTYLE}}"/><br/><div class="mdl-align"><div class="{{CSS.IMAGEPREVIEWBOX}}"><img src="#" class="{{CSS.IMAGEPREVIEW}}" alt="" style="display: none;"/></div><button class="btn btn-secondary {{CSS.INPUTSUBMIT}}" type="submit">{{get_string "saveimage" component}}</button></div></form>',a='<img src="{{url}}" alt="{{alt}}" {{#if width}}width="{{width}}" {{/if}}{{#if height}}height="{{height}}" {{/if}}{{#if presentation}}role="presentation" {{/if}}{{#if customstyle}}style="{{customstyle}}" {{/if}}{{#if classlist}}class="{{classlist}}" {{/if}}{{#if id}}id="{{id}}" {{/if}}/>';e.namespace("M.atto_image").Button=e.Base.create("button",e.M.editor_atto.EditorPlugin,[],{_currentSelection:null,_selectedImage:null,_form:null,_rawImageDimensions:null,initializer:function(){this.addButton({icon:"e/insert_edit_image",callback:this._displayDialogue,tags:"img",tagMatchRequiresAll:!1}),this.editor.delegate("dblclick",this._displayDialogue,"img",this),this.editor.delegate("click",this._handleClick,"img",this),this.editor.on("paste",this._handlePaste,this),this.editor.on("drop",this._handleDragDrop,this),this.editor.on("dragover",function(e){e.preventDefault()},this),this.editor.on("dragenter",function(e){e.preventDefault()},this)},_handleDragDrop:function(e){return!e._event||!e._event.dataTransfer?!0:this._handlePasteOrDropHelper(e,e._event.dataTransfer)},_handlePaste:function(e){return!e._event||!e._event.clipboardData?!0:this._handlePasteOrDropHelper(e,e._event.clipboardData)},_handlePasteOrDropHelper:function(e,t){var n=t.items,r=!1;for(var i=0;i<n.length;i++){var s=n[i];if(s.kind!=="file")continue;if(!this._isImage(s.type))continue;this._uploadImage(s.getAsFile()),r=!0}return r?(e.preventDefault(),e.stopPropagation(),!1):!0},_isImage:function(e){return e.indexOf("image/")===0},_uploadImage:function(t){var n=this,r=this.get("host"),i=e.Handlebars.compile(a);r.saveSelection();var s=r.get("filepickeroptions").image,u=s.savepath===undefined?"/":s.savepath,f=new FormData,l=0,c="",h=new XMLHttpRequest,p="",d=Object.keys(s.repositories);f.append("repo_upload_file",t),f.append("itemid",s.itemid);for(var v=0;v<d.length;v++)if(s.repositories[d[v]].type==="upload"){f.append("repo_id",s.repositories[d[v]].id);break}
+f.append("env",s.env),f.append("sesskey",M.cfg.sesskey),f.append("client_id",s.client_id),f.append("savepath",u),f.append("ctx_id",s.context.id),l=(new Date).getTime(),c="moodleimage_"+Math.round(Math.random()*1e5)+"-"+l,r.focus(),r.restoreSelection(),p=i({url:M.util.image_url("i/loading_small","moodle"),alt:M.util.get_string("uploading",o),id:c}),r.insertContentAtFocusPoint(p),n.markUpdated(),h.onreadystatechange=function(){var t=n.editor.one("#"+c),r,s,o,u;if(h.readyState===4)if(h.status===200){r=JSON.parse(h.responseText);if(r){if(r.error)throw t&&t.remove(!0),new M.core.ajaxException(r);s=r,r.event&&r.event==="fileexists"&&(s=r.newfile),o=i({url:s.url,presentation:!0}),u=e.Node.create(o),t?t.replace(u):n.editor.appendChild(u),n.markUpdated()}}else e.use("moodle-core-notification-alert",function(){new M.core.alert({message:M.util.get_string("servererror","moodle")})}),t&&t.remove(!0)},h.open("POST",M.cfg.wwwroot+"/repository/repository_ajax.php?action=upload",!0),h.send(f)},_handleClick:function(e){var t=e.target,n=this.get("host").getSelectionFromNode(t);this.get("host").getSelection()!==n&&this.get("host").setSelection(n)},_displayDialogue:function(){this._currentSelection=this.get("host").getSelection();if(this._currentSelection===!1)return;this._rawImageDimensions=null;var e=this.getDialogue({headerContent:M.util.get_string("imageproperties",o),width:"auto",focusAfterHide:!0,focusOnShowSelector:r.INPUTURL});e.set("bodyContent",this._getDialogueContent()).show()},_loadPreviewImage:function(e){var t=new Image,r=this;t.onerror=function(){var e=r._form.one("."+n.IMAGEPREVIEW);e.setStyles({display:"none"}),r.getDialogue().centerDialogue()},t.onload=function(){var e,t,i,o,u;r._rawImageDimensions={width:this.width,height:this.height},e=r._form.one("."+n.INPUTWIDTH),t=e.get("value"),t===""&&(e.set("value",this.width),t=""+this.width),e=r._form.one("."+n.INPUTHEIGHT),i=e.get("value"),i===""&&(e.set("value",this.height),i=""+this.height),e=r._form.one("."+n.IMAGEPREVIEW),e.setAttribute("src",this.src),e.setStyles({display:"inline"}),e=r._form.one("."+n.INPUTCONSTRAIN),t.match(s.ISPERCENT)&&i.match(s.ISPERCENT)?e.set("checked",t===i):(this.width===0&&(this.width=1),this.height===0&&(this.height=1),o=Math.round(1e3*parseInt(t,10)/this.width),u=Math.round(1e3*parseInt(i,10)/this.height),e.set("checked",o===u)),r._autoAdjustSize(r),r.getDialogue().centerDialogue()},t.src=e},_getDialogueContent:function(){var t=e.Handlebars.compile(u),r=this.get("host").canShowFilepicker("image"),s=e.Node.create(t({elementid:this.get("host").get("elementid"),CSS:n,component:o,showFilepicker:r,alignments:i}));return this._form=s,this._applyImageProperties(this._form),this._form.one("."+n.INPUTURL).on("blur",this._urlChanged,this),this._form.one("."+n.IMAGEPRESENTATION).on("change",this._updateWarning,this),this._form.one("."+n.INPUTALT).on("change",this._updateWarning,this),this._form.one("."+n.INPUTWIDTH).on("blur",this._autoAdjustSize,this),this._form.one("."+n.INPUTHEIGHT).on("blur",this._autoAdjustSize,this,!0),this._form.one("."+n.INPUTCONSTRAIN).on("change",function(e){e.target.get("checked")&&this._autoAdjustSize(e)},this),this._form.one("."+n.INPUTURL).on("blur",this._urlChanged,this),this._form.one("."+n.INPUTSUBMIT).on("click",this._setImage,this),r&&this._form.one("."+n.IMAGEBROWSER).on("click",function(){this.get("host").showFilepicker("image",this._filepickerCallback,this)},this),s},_autoAdjustSize:function(e,t){t=t||!1;var r=this._form.one("."+n.INPUTWIDTH),i="width",o=this._form.one("."+n.INPUTHEIGHT),u="height",a=this._form.one("."+n.INPUTCONSTRAIN),f=r.get("value"),l=o.get("value"),c=this._form.one("."+n.IMAGEPREVIEW),h,p;if(!this._rawImageDimensions)return;f===""&&(f=this._rawImageDimensions[i],r.set("value",f),f=r.get("value")),c.setStyles({width:null,height:null});if(!a.get("checked"))f.match(s.ISPERCENT)?(h=parseInt(f,10),p=this._rawImageDimensions.width/100*h,c.setStyle("width",p+"px")):c.setStyle("width",f+"px"),l.match(s.ISPERCENT)?(h=parseInt(l,10),p=this._rawImageDimensions.height/100*h,c.setStyle("height",p+"px")):c.setStyle("height",l+"px");else{if(t){var d;d=r,r=o,o=d,d=i,i=u,u=d,d=f,f=l,l=d}f.match(s.ISPERCENT)?(l=f,h=parseInt(f,10),p=this._rawImageDimensions.width/100*h,c.setStyle("width",p),p=this._rawImageDimensions.height/100*h,c.setStyle("height",p)):(l=Math.round(f/this._rawImageDimensions[i]*this._rawImageDimensions[u]),t?c.setStyles({width:l,height:f}):c.setStyles({width:f,height:l})),o.set("value",l)}},_filepickerCallback:function(e){if(e.url!==""){var t=this._form.one("."+n.INPUTURL);t.set("value",e.url),this._form.one("."+n.INPUTWIDTH).set("value",""),this._form.one("."+n.INPUTHEIGHT).set("value",""),this._loadPreviewImage(e.url)}},_applyImageProperties:function(e){var t=this._getSelectedImageProperties(),r=e.one("."+n.IMAGEPREVIEW);if(t===!1){r.setStyle("display","none"),i.some(function(t){return t.isDefault?(e.one("."+n.INPUTALIGNMENT).set("value",t.value),!0):!1},this);return}t.align&&e.one("."+n.INPUTALIGNMENT).set("value",t.align),t.customstyle&&e.one("."+n.INPUTCUSTOMSTYLE).set("value",t.customstyle),t.width&&e.one("."+n.INPUTWIDTH).set("value",t.width),t.height&&e.one("."+n.INPUTHEIGHT).set("value",t.height),t.alt&&e.one("."+n.INPUTALT).set("value",t.alt),t.src&&(e.one("."+n.INPUTURL).set("value",t.src),this._loadPreviewImage(t.src)),t.presentation&&e.one("."+n.IMAGEPRESENTATION).set("checked","checked"),this._autoAdjustSize()},_getSelectedImageProperties:function(){var e={src:null,alt:null,width:null,height:null,align:"",presentation:!1},t=this.get("host").getSelectedNodes(),n,r,i,o;return t&&(t=t.filter("img")),t&&t.size()?(o=this._removeLegacyAlignment(t.item(0)),this._selectedImage=o,i=o.getAttribute("style"),e.customstyle=i,n=o.getAttribute("width"),n.match(s.ISPERCENT)||(n=parseInt(n,10)),r=o.getAttribute("height"),r.match(s.ISPERCENT)||(r=parseInt(r,10)),n!==0&&(e.width=n),r!==0&&(e.height=r),this._getAlignmentPropeties(o,e),e.src=o.getAttribute("src"),e.alt=o
+.getAttribute("alt")||"",e.presentation=o.get("role")==="presentation",e):(this._selectedImage=null,!1)},_getAlignmentPropeties:function(e,t){var n=!1,r;n=i.some(function(n){var i=this._getAlignmentClass(n.value);return e.hasClass(i)?(t.align=n.value,!0):(n.isDefault&&(r=n.value),!1)},this),!n&&r&&(t.align=r)},_urlChanged:function(){var e=this._form.one("."+n.INPUTURL);e.get("value")!==""&&this._loadPreviewImage(e.get("value"))},_setImage:function(t){var r=this._form,i=r.one("."+n.INPUTURL).get("value"),o=r.one("."+n.INPUTALT).get("value"),u=r.one("."+n.INPUTWIDTH).get("value"),f=r.one("."+n.INPUTHEIGHT).get("value"),l=this._getAlignmentClass(r.one("."+n.INPUTALIGNMENT).get("value")),c=r.one("."+n.IMAGEPRESENTATION).get("checked"),h=r.one("."+n.INPUTCONSTRAIN).get("checked"),p,d=r.one("."+n.INPUTCUSTOMSTYLE).get("value"),v=[],m=this.get("host");t.preventDefault();if(this._updateWarning())return;m.focus();if(i!==""){this._selectedImage?m.setSelection(m.getSelectionFromNode(this._selectedImage)):m.setSelection(this._currentSelection),h&&v.push(n.RESPONSIVE),v.push(l);if(!u.match(s.ISPERCENT)&&isNaN(parseInt(u,10))){r.one("."+n.INPUTWIDTH).focus();return}if(!f.match(s.ISPERCENT)&&isNaN(parseInt(f,10))){r.one("."+n.INPUTHEIGHT).focus();return}var g=e.Handlebars.compile(a);p=g({url:i,alt:o,width:u,height:f,presentation:c,customstyle:d,classlist:v.join(" ")}),this.get("host").insertContentAtFocusPoint(p),this.markUpdated()}this.getDialogue({focusAfterHide:null}).hide()},_removeLegacyAlignment:function(t){return t.getStyle("margin")?(i.some(function(n){if(t.getStyle(n.name)!==n.value)return!1;var r=e.Node.create("<div>");return r.setStyle("margin",n.margin),t.getStyle("margin")!==r.getStyle("margin")?!1:(t.addClass(this._getAlignmentClass(n.value)),t.setStyle(n.name,null),t.setStyle("margin",null),!0)},this),t):t},_getAlignmentClass:function(e){return n.ALIGNSETTINGS+"_"+e},_updateWarning:function(){var e=this._form,t=!0,r=e.one("."+n.INPUTALT).get("value"),i=e.one("."+n.IMAGEPRESENTATION).get("checked");return r===""&&!i?(e.one("."+n.IMAGEALTWARNING).setStyle("display","block"),e.one("."+n.INPUTALT).setAttribute("aria-invalid",!0),e.one("."+n.IMAGEPRESENTATION).setAttribute("aria-invalid",!0),t=!0):(e.one("."+n.IMAGEALTWARNING).setStyle("display","none"),e.one("."+n.INPUTALT).setAttribute("aria-invalid",!1),e.one("."+n.IMAGEPRESENTATION).setAttribute("aria-invalid",!1),t=!1),this.getDialogue().centerDialogue(),t}})},"@VERSION@",{requires:["moodle-editor_atto-plugin"]});
diff --git a/lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button.js b/lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button.js
index 93e07c3dd42..5c65d96a7db 100644
--- a/lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button.js
+++ b/lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button.js
@@ -243,6 +243,7 @@ Y.namespace('M.atto_image').Button = Y.Base.create('button', Y.M.editor_atto.Edi
         });
         this.editor.delegate('dblclick', this._displayDialogue, 'img', this);
         this.editor.delegate('click', this._handleClick, 'img', this);
+        this.editor.on('paste', this._handlePaste, this);
         this.editor.on('drop', this._handleDragDrop, this);
 
         // e.preventDefault needed to stop the default event from clobbering the desired behaviour in some browsers.
@@ -259,118 +260,189 @@ Y.namespace('M.atto_image').Button = Y.Base.create('button', Y.M.editor_atto.Edi
      *
      * @method _handleDragDrop
      * @param {EventFacade} e
-     * @return mixed
+     * @return {boolean} false if we handled the event, else true.
      * @private
      */
     _handleDragDrop: function(e) {
+        if (!e._event || !e._event.dataTransfer) {
+            // Drop not fully supported in this browser.
+            return true;
+        }
+
+        return this._handlePasteOrDropHelper(e, e._event.dataTransfer);
+    },
+
+    /**
+     * Handles paste events where - if the thing being pasted is an image.
+     *
+     * @method _handlePaste
+     * @param {EventFacade} e
+     * @return {boolean} false if we handled the event, else true.
+     * @private
+     */
+    _handlePaste: function(e) {
+        if (!e._event || !e._event.clipboardData) {
+            // Paste not fully supported in this browser.
+            return true;
+        }
+
+        return this._handlePasteOrDropHelper(e, e._event.clipboardData);
+    },
+
+    /**
+     * Handle a drag and drop event with an image.
+     *
+     * @method _handleDragDrop
+     * @param {EventFacade} e
+     * @param {DataTransfer} dataTransfer
+     * @return {boolean} false if we handled the event, else true.
+     * @private
+     */
+    _handlePasteOrDropHelper: function(e, dataTransfer) {
+
+        var items = dataTransfer.items,
+            didUpload = false;
+        for (var i = 0; i < items.length; i++) {
+            var item = items[i];
+            if (item.kind !== 'file') {
+                continue;
+            }
+            if (!this._isImage(item.type)) {
+                continue;
+            }
+            this._uploadImage(item.getAsFile());
+            didUpload = true;
+        }
+
+        if (didUpload) {
+            // We handled this.
+            e.preventDefault();
+            e.stopPropagation();
+            return false;
+        } else {
+            // Let someone else try to handle it.
+            return true;
+        }
+    },
+
+    /**
+     * Is this file an image?
+     *
+     * @method _isImage
+     * @param {string} mimeType the file's mime type.
+     * @return {boolean} true if the file has an image mimeType.
+     * @private
+     */
+    _isImage: function(mimeType) {
+        return mimeType.indexOf('image/') === 0;
+    },
+
+    /**
+     * Used by _handleDragDrop and _handlePaste to upload an image and insert it.
+     *
+     * @method _uploadImage
+     * @param {File} fileToSave
+     * @private
+     */
+    _uploadImage: function(fileToSave) {
 
         var self = this,
             host = this.get('host'),
             template = Y.Handlebars.compile(IMAGETEMPLATE);
 
         host.saveSelection();
-        e = e._event;
 
-        // Only handle the event if an image file was dropped in.
-        var handlesDataTransfer = (e.dataTransfer && e.dataTransfer.files && e.dataTransfer.files.length);
-        if (handlesDataTransfer && /^image\//.test(e.dataTransfer.files[0].type)) {
+        var options = host.get('filepickeroptions').image,
+            savepath = (options.savepath === undefined) ? '/' : options.savepath,
+            formData = new FormData(),
+            timestamp = 0,
+            uploadid = "",
+            xhr = new XMLHttpRequest(),
+            imagehtml = "",
+            keys = Object.keys(options.repositories);
 
-            var options = host.get('filepickeroptions').image,
-                savepath = (options.savepath === undefined) ? '/' : options.savepath,
-                formData = new FormData(),
-                timestamp = 0,
-                uploadid = "",
-                xhr = new XMLHttpRequest(),
-                imagehtml = "",
-                keys = Object.keys(options.repositories);
+        formData.append('repo_upload_file', fileToSave);
+        formData.append('itemid', options.itemid);
 
-            e.preventDefault();
-            e.stopPropagation();
-            formData.append('repo_upload_file', e.dataTransfer.files[0]);
-            formData.append('itemid', options.itemid);
-
-            // List of repositories is an object rather than an array.  This makes iteration more awkward.
-            for (var i = 0; i < keys.length; i++) {
-                if (options.repositories[keys[i]].type === 'upload') {
-                    formData.append('repo_id', options.repositories[keys[i]].id);
-                    break;
-                }
+        // List of repositories is an object rather than an array.  This makes iteration more awkward.
+        for (var i = 0; i < keys.length; i++) {
+            if (options.repositories[keys[i]].type === 'upload') {
+                formData.append('repo_id', options.repositories[keys[i]].id);
+                break;
             }
-            formData.append('env', options.env);
-            formData.append('sesskey', M.cfg.sesskey);
-            formData.append('client_id', options.client_id);
-            formData.append('savepath', savepath);
-            formData.append('ctx_id', options.context.id);
+        }
+        formData.append('env', options.env);
+        formData.append('sesskey', M.cfg.sesskey);
+        formData.append('client_id', options.client_id);
+        formData.append('savepath', savepath);
+        formData.append('ctx_id', options.context.id);
 
-            // Insert spinner as a placeholder.
-            timestamp = new Date().getTime();
-            uploadid = 'moodleimage_' + Math.round(Math.random() * 100000) + '-' + timestamp;
-            host.focus();
-            host.restoreSelection();
-            imagehtml = template({
-                url: M.util.image_url("i/loading_small", 'moodle'),
-                alt: M.util.get_string('uploading', COMPONENTNAME),
-                id: uploadid
-            });
-            host.insertContentAtFocusPoint(imagehtml);
-            self.markUpdated();
+        // Insert spinner as a placeholder.
+        timestamp = new Date().getTime();
+        uploadid = 'moodleimage_' + Math.round(Math.random() * 100000) + '-' + timestamp;
+        host.focus();
+        host.restoreSelection();
+        imagehtml = template({
+            url: M.util.image_url("i/loading_small", 'moodle'),
+            alt: M.util.get_string('uploading', COMPONENTNAME),
+            id: uploadid
+        });
+        host.insertContentAtFocusPoint(imagehtml);
+        self.markUpdated();
 
-            // Kick off a XMLHttpRequest.
-            xhr.onreadystatechange = function() {
-                var placeholder = self.editor.one('#' + uploadid),
-                    result,
-                    file,
-                    newhtml,
-                    newimage;
+        // Kick off a XMLHttpRequest.
+        xhr.onreadystatechange = function() {
+            var placeholder = self.editor.one('#' + uploadid),
+                result,
+                file,
+                newhtml,
+                newimage;
 
-                if (xhr.readyState === 4) {
-                    if (xhr.status === 200) {
-                        result = JSON.parse(xhr.responseText);
-                        if (result) {
-                            if (result.error) {
-                                if (placeholder) {
-                                    placeholder.remove(true);
-                                }
-                                return new M.core.ajaxException(result);
-                            }
-
-                            file = result;
-                            if (result.event && result.event === 'fileexists') {
-                                // A file with this name is already in use here - rename to avoid conflict.
-                                // Chances are, it's a different image (stored in a different folder on the user's computer).
-                                // If the user wants to reuse an existing image, they can copy/paste it within the editor.
-                                file = result.newfile;
-                            }
-
-                            // Replace placeholder with actual image.
-                            newhtml = template({
-                                url: file.url,
-                                presentation: true
-                            });
-                            newimage = Y.Node.create(newhtml);
+            if (xhr.readyState === 4) {
+                if (xhr.status === 200) {
+                    result = JSON.parse(xhr.responseText);
+                    if (result) {
+                        if (result.error) {
                             if (placeholder) {
-                                placeholder.replace(newimage);
-                            } else {
-                                self.editor.appendChild(newimage);
+                                placeholder.remove(true);
                             }
-                            self.markUpdated();
+                            throw new M.core.ajaxException(result);
                         }
-                    } else {
-                        Y.use('moodle-core-notification-alert', function() {
-                            new M.core.alert({message: M.util.get_string('servererror', 'moodle')});
+
+                        file = result;
+                        if (result.event && result.event === 'fileexists') {
+                            // A file with this name is already in use here - rename to avoid conflict.
+                            // Chances are, it's a different image (stored in a different folder on the user's computer).
+                            // If the user wants to reuse an existing image, they can copy/paste it within the editor.
+                            file = result.newfile;
+                        }
+
+                        // Replace placeholder with actual image.
+                        newhtml = template({
+                            url: file.url,
+                            presentation: true
                         });
+                        newimage = Y.Node.create(newhtml);
                         if (placeholder) {
-                            placeholder.remove(true);
+                            placeholder.replace(newimage);
+                        } else {
+                            self.editor.appendChild(newimage);
                         }
+                        self.markUpdated();
+                    }
+                } else {
+                    Y.use('moodle-core-notification-alert', function() {
+                        new M.core.alert({message: M.util.get_string('servererror', 'moodle')});
+                    });
+                    if (placeholder) {
+                        placeholder.remove(true);
                     }
                 }
-            };
-            xhr.open("POST", M.cfg.wwwroot + '/repository/repository_ajax.php?action=upload', true);
-            xhr.send(formData);
-            return false;
-        }
-
-},
+            }
+        };
+        xhr.open("POST", M.cfg.wwwroot + '/repository/repository_ajax.php?action=upload', true);
+        xhr.send(formData);
+    },
 
     /**
      * Handle a click on an image.
diff --git a/lib/editor/atto/plugins/image/yui/src/button/js/button.js b/lib/editor/atto/plugins/image/yui/src/button/js/button.js
index 0289f06f195..7aa557af357 100644
--- a/lib/editor/atto/plugins/image/yui/src/button/js/button.js
+++ b/lib/editor/atto/plugins/image/yui/src/button/js/button.js
@@ -241,6 +241,7 @@ Y.namespace('M.atto_image').Button = Y.Base.create('button', Y.M.editor_atto.Edi
         });
         this.editor.delegate('dblclick', this._displayDialogue, 'img', this);
         this.editor.delegate('click', this._handleClick, 'img', this);
+        this.editor.on('paste', this._handlePaste, this);
         this.editor.on('drop', this._handleDragDrop, this);
 
         // e.preventDefault needed to stop the default event from clobbering the desired behaviour in some browsers.
@@ -257,118 +258,189 @@ Y.namespace('M.atto_image').Button = Y.Base.create('button', Y.M.editor_atto.Edi
      *
      * @method _handleDragDrop
      * @param {EventFacade} e
-     * @return mixed
+     * @return {boolean} false if we handled the event, else true.
      * @private
      */
     _handleDragDrop: function(e) {
+        if (!e._event || !e._event.dataTransfer) {
+            // Drop not fully supported in this browser.
+            return true;
+        }
+
+        return this._handlePasteOrDropHelper(e, e._event.dataTransfer);
+    },
+
+    /**
+     * Handles paste events where - if the thing being pasted is an image.
+     *
+     * @method _handlePaste
+     * @param {EventFacade} e
+     * @return {boolean} false if we handled the event, else true.
+     * @private
+     */
+    _handlePaste: function(e) {
+        if (!e._event || !e._event.clipboardData) {
+            // Paste not fully supported in this browser.
+            return true;
+        }
+
+        return this._handlePasteOrDropHelper(e, e._event.clipboardData);
+    },
+
+    /**
+     * Handle a drag and drop event with an image.
+     *
+     * @method _handleDragDrop
+     * @param {EventFacade} e
+     * @param {DataTransfer} dataTransfer
+     * @return {boolean} false if we handled the event, else true.
+     * @private
+     */
+    _handlePasteOrDropHelper: function(e, dataTransfer) {
+
+        var items = dataTransfer.items,
+            didUpload = false;
+        for (var i = 0; i < items.length; i++) {
+            var item = items[i];
+            if (item.kind !== 'file') {
+                continue;
+            }
+            if (!this._isImage(item.type)) {
+                continue;
+            }
+            this._uploadImage(item.getAsFile());
+            didUpload = true;
+        }
+
+        if (didUpload) {
+            // We handled this.
+            e.preventDefault();
+            e.stopPropagation();
+            return false;
+        } else {
+            // Let someone else try to handle it.
+            return true;
+        }
+    },
+
+    /**
+     * Is this file an image?
+     *
+     * @method _isImage
+     * @param {string} mimeType the file's mime type.
+     * @return {boolean} true if the file has an image mimeType.
+     * @private
+     */
+    _isImage: function(mimeType) {
+        return mimeType.indexOf('image/') === 0;
+    },
+
+    /**
+     * Used by _handleDragDrop and _handlePaste to upload an image and insert it.
+     *
+     * @method _uploadImage
+     * @param {File} fileToSave
+     * @private
+     */
+    _uploadImage: function(fileToSave) {
 
         var self = this,
             host = this.get('host'),
             template = Y.Handlebars.compile(IMAGETEMPLATE);
 
         host.saveSelection();
-        e = e._event;
 
-        // Only handle the event if an image file was dropped in.
-        var handlesDataTransfer = (e.dataTransfer && e.dataTransfer.files && e.dataTransfer.files.length);
-        if (handlesDataTransfer && /^image\//.test(e.dataTransfer.files[0].type)) {
+        var options = host.get('filepickeroptions').image,
+            savepath = (options.savepath === undefined) ? '/' : options.savepath,
+            formData = new FormData(),
+            timestamp = 0,
+            uploadid = "",
+            xhr = new XMLHttpRequest(),
+            imagehtml = "",
+            keys = Object.keys(options.repositories);
 
-            var options = host.get('filepickeroptions').image,
-                savepath = (options.savepath === undefined) ? '/' : options.savepath,
-                formData = new FormData(),
-                timestamp = 0,
-                uploadid = "",
-                xhr = new XMLHttpRequest(),
-                imagehtml = "",
-                keys = Object.keys(options.repositories);
+        formData.append('repo_upload_file', fileToSave);
+        formData.append('itemid', options.itemid);
 
-            e.preventDefault();
-            e.stopPropagation();
-            formData.append('repo_upload_file', e.dataTransfer.files[0]);
-            formData.append('itemid', options.itemid);
-
-            // List of repositories is an object rather than an array.  This makes iteration more awkward.
-            for (var i = 0; i < keys.length; i++) {
-                if (options.repositories[keys[i]].type === 'upload') {
-                    formData.append('repo_id', options.repositories[keys[i]].id);
-                    break;
-                }
+        // List of repositories is an object rather than an array.  This makes iteration more awkward.
+        for (var i = 0; i < keys.length; i++) {
+            if (options.repositories[keys[i]].type === 'upload') {
+                formData.append('repo_id', options.repositories[keys[i]].id);
+                break;
             }
-            formData.append('env', options.env);
-            formData.append('sesskey', M.cfg.sesskey);
-            formData.append('client_id', options.client_id);
-            formData.append('savepath', savepath);
-            formData.append('ctx_id', options.context.id);
+        }
+        formData.append('env', options.env);
+        formData.append('sesskey', M.cfg.sesskey);
+        formData.append('client_id', options.client_id);
+        formData.append('savepath', savepath);
+        formData.append('ctx_id', options.context.id);
 
-            // Insert spinner as a placeholder.
-            timestamp = new Date().getTime();
-            uploadid = 'moodleimage_' + Math.round(Math.random() * 100000) + '-' + timestamp;
-            host.focus();
-            host.restoreSelection();
-            imagehtml = template({
-                url: M.util.image_url("i/loading_small", 'moodle'),
-                alt: M.util.get_string('uploading', COMPONENTNAME),
-                id: uploadid
-            });
-            host.insertContentAtFocusPoint(imagehtml);
-            self.markUpdated();
+        // Insert spinner as a placeholder.
+        timestamp = new Date().getTime();
+        uploadid = 'moodleimage_' + Math.round(Math.random() * 100000) + '-' + timestamp;
+        host.focus();
+        host.restoreSelection();
+        imagehtml = template({
+            url: M.util.image_url("i/loading_small", 'moodle'),
+            alt: M.util.get_string('uploading', COMPONENTNAME),
+            id: uploadid
+        });
+        host.insertContentAtFocusPoint(imagehtml);
+        self.markUpdated();
 
-            // Kick off a XMLHttpRequest.
-            xhr.onreadystatechange = function() {
-                var placeholder = self.editor.one('#' + uploadid),
-                    result,
-                    file,
-                    newhtml,
-                    newimage;
+        // Kick off a XMLHttpRequest.
+        xhr.onreadystatechange = function() {
+            var placeholder = self.editor.one('#' + uploadid),
+                result,
+                file,
+                newhtml,
+                newimage;
 
-                if (xhr.readyState === 4) {
-                    if (xhr.status === 200) {
-                        result = JSON.parse(xhr.responseText);
-                        if (result) {
-                            if (result.error) {
-                                if (placeholder) {
-                                    placeholder.remove(true);
-                                }
-                                return new M.core.ajaxException(result);
-                            }
-
-                            file = result;
-                            if (result.event && result.event === 'fileexists') {
-                                // A file with this name is already in use here - rename to avoid conflict.
-                                // Chances are, it's a different image (stored in a different folder on the user's computer).
-                                // If the user wants to reuse an existing image, they can copy/paste it within the editor.
-                                file = result.newfile;
-                            }
-
-                            // Replace placeholder with actual image.
-                            newhtml = template({
-                                url: file.url,
-                                presentation: true
-                            });
-                            newimage = Y.Node.create(newhtml);
+            if (xhr.readyState === 4) {
+                if (xhr.status === 200) {
+                    result = JSON.parse(xhr.responseText);
+                    if (result) {
+                        if (result.error) {
                             if (placeholder) {
-                                placeholder.replace(newimage);
-                            } else {
-                                self.editor.appendChild(newimage);
+                                placeholder.remove(true);
                             }
-                            self.markUpdated();
+                            throw new M.core.ajaxException(result);
                         }
-                    } else {
-                        Y.use('moodle-core-notification-alert', function() {
-                            new M.core.alert({message: M.util.get_string('servererror', 'moodle')});
+
+                        file = result;
+                        if (result.event && result.event === 'fileexists') {
+                            // A file with this name is already in use here - rename to avoid conflict.
+                            // Chances are, it's a different image (stored in a different folder on the user's computer).
+                            // If the user wants to reuse an existing image, they can copy/paste it within the editor.
+                            file = result.newfile;
+                        }
+
+                        // Replace placeholder with actual image.
+                        newhtml = template({
+                            url: file.url,
+                            presentation: true
                         });
+                        newimage = Y.Node.create(newhtml);
                         if (placeholder) {
-                            placeholder.remove(true);
+                            placeholder.replace(newimage);
+                        } else {
+                            self.editor.appendChild(newimage);
                         }
+                        self.markUpdated();
+                    }
+                } else {
+                    Y.use('moodle-core-notification-alert', function() {
+                        new M.core.alert({message: M.util.get_string('servererror', 'moodle')});
+                    });
+                    if (placeholder) {
+                        placeholder.remove(true);
                     }
                 }
-            };
-            xhr.open("POST", M.cfg.wwwroot + '/repository/repository_ajax.php?action=upload', true);
-            xhr.send(formData);
-            return false;
-        }
-
-},
+            }
+        };
+        xhr.open("POST", M.cfg.wwwroot + '/repository/repository_ajax.php?action=upload', true);
+        xhr.send(formData);
+    },
 
     /**
      * Handle a click on an image.