Merge branch 'MDL-44765-master' of git://github.com/phalacee/moodle

diff --cc lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-debug.js
index 0dd910f,7741abf..d1ee9b8
Binary files differ

diff --cc lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-min.js
index fbb7a71,b598ba7..8b5f697
Binary files differ

diff --cc lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button.js
index 0dd910f,7741abf..d1ee9b8
Binary files differ

diff --cc lib/editor/atto/plugins/image/yui/src/button/js/button.js
Simple merge