Merge branch 'MDL-44868-master' of git://github.com/FMCorz/moodle

Conflicts:
	lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
	lib/editor/atto/yui/build/moodle-editor_atto-plugin/moodle-editor_atto-plugin-min.js

diff --cc lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-debug.js
index 2f8ac9c,98084c9..92900e0
Binary files differ

diff --cc lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
index 5efbe55,c2cf00d..ff90434
Binary files differ

diff --cc lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor.js
index 477a74c,c03a1c3..d733823
Binary files differ

diff --cc lib/editor/atto/yui/build/moodle-editor_atto-plugin/moodle-editor_atto-plugin-debug.js
index 910bcd2,a35a28e..df9caae
Binary files differ

diff --cc lib/editor/atto/yui/build/moodle-editor_atto-plugin/moodle-editor_atto-plugin-min.js
index c3911c4,757d58e..8a28441
Binary files differ

diff --cc lib/editor/atto/yui/build/moodle-editor_atto-plugin/moodle-editor_atto-plugin.js
index 957c316,039dc7a..ffbba1a
Binary files differ

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