Merge branch 'MDL-52954-master' of git://github.com/damyon/moodle

diff --cc config-dist.php
Simple merge

diff --cc lib/amd/build/form-autocomplete.min.js
index 76fd2b9,7ea396f..9e44334
Binary files differ

diff --cc lib/amd/src/form-autocomplete.js
Simple merge

diff --cc lib/db/services.php
Simple merge

diff --cc lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-debug.js
index 4efa43a,0332fd0..09ba0b7
Binary files differ

diff --cc lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
index b64c044,10d60c3..912122e
Binary files differ

diff --cc lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor.js
index 3b9fe61,9f6f779..27f74d3
Binary files differ

diff --cc lib/upgrade.txt
Simple merge

diff --cc mod/assign/externallib.php
Simple merge