Merge branch 'MDL-55244-master' of git://github.com/danpoltawski/moodle

diff --cc lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-debug.js
index 5f1c61a,3c0761f..e0681b5
Binary files differ

diff --cc lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor.js
index 2ce7c72,4c61efa..7720c6e
Binary files differ

diff --cc lib/editor/atto/yui/src/editor/js/autosave.js
Simple merge

diff --cc lib/yui/build/moodle-core-formchangechecker/moodle-core-formchangechecker-debug.js
index 4b4f09a,5a20393..7d9caa3
Binary files differ

diff --cc lib/yui/build/moodle-core-formchangechecker/moodle-core-formchangechecker.js
index 4b4f09a,5a20393..7d9caa3
Binary files differ

diff --cc lib/yui/src/formchangechecker/js/formchangechecker.js
Simple merge

diff --cc mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-debug.js
index 73f915a,377c192..9fca563
Binary files differ

diff --cc mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor.js
index 73f915a,377c192..9fca563
Binary files differ

diff --cc mod/assign/feedback/editpdf/yui/src/editor/js/comment.js
Simple merge