Merge branch 'MDL-42571' of git://github.com/blaky/moodle

Conflicts:
	mod/assign/feedback/editpdf/version.php

diff --cc mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-debug.js
index 565dd2d,50c827f..a7cb8ee
Binary files differ

diff --cc mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor.js
index 565dd2d,50c827f..a7cb8ee
Binary files differ

diff --cc mod/assign/feedback/editpdf/yui/src/editor/js/editor.js
index 33c915a,1c1904e..2fd4def
--- 1/mod/assign/feedback/editpdf/yui/src/editor/js/editor.js
--- 2/mod/assign/feedback/editpdf/yui/src/editor/js/editor.js
+++ b/mod/assign/feedback/editpdf/yui/src/editor/js/editor.js
@@@ -672,7 -672,16 +672,16 @@@ EDITOR.prototype = 
  
          return drawable;
      },
 -    
 +
+     /**
+      * Find an element within the dialogue.
+      * @protected
+      * @method get_dialogue_element
+      */
+     get_dialogue_element : function(selector) {
+         return this.dialogue.get('boundingBox').one(selector);
+     },
+ 
      /**
       * Redraw the active edit.
       * @protected