MDL-45145 mod_quiz: ensure quiz cmid is set before triggering the 'attempt_deleted' event
Merge branch 'wip-MDL-45154-master' of git://github.com/marinaglancy/moodle
Merge branch 'MDL-41975-master' of git://github.com/FMCorz/moodle
Merge branch 'MDL-45027-master' of https://github.com/sammarshallou/moodle

Conflicts:
	availability/yui/build/moodle-core_availability-form/moodle-core_availability-form-min.js
Merge branch 'MDL-44990-master' of git://github.com/lameze/moodle
Merge branch 'MDL-45059-master' of https://github.com/sammarshallou/moodle
Merge branch 'MDL-45071_master' of https://github.com/markn86/moodle
Merge branch 'wip-MDL-45036-master' of git://github.com/abgreeve/moodle
Merge branch 'wip-MDL-43626-master' of git://github.com/abgreeve/moodle
MDL-43789: coursename disallows spaces in user bulk actions filter

Spaces and other non alphanumeric characters are disallowed in
coursename filter for user bulk actions.This prevents filtering
based upon courserole if the coursename contains spaces or other non
alphanumeric characters.
Merge branch 'MDL-39607-master' of git://github.com/FMCorz/moodle
Merge branch 'MDL-44906-master' of git://github.com/andrewnicols/moodle
Merge branch 'MDL-44674-master' of git://github.com/andrewnicols/moodle

Conflicts:
	lib/editor/atto/yui/build/moodle-editor_atto-plugin/moodle-editor_atto-plugin-min.js
Merge branch '45123-27' of git://github.com/samhemelryk/moodle
Merge branch 'MDL-45110-master' of git://github.com/jamiepratt/moodle
Merge branch 'MDL-45023-master' of git://github.com/jamiepratt/moodle
Merge branch 'MDL-44778_atto_border' of https://github.com/andyjdavis/moodle
Merge branch '45147-27' of git://github.com/samhemelryk/moodle
Merge branch 'MDL-45010-master' of git://github.com/FMCorz/moodle
Merge branch 'MDL-40716_master' of https://github.com/nadavkav/moodle