MDL-36636 usability: Comment delete icon repositioned
MDL-36659 usability: Adjust main menu block CSS
MDL-36696 - filepicker: remove superfluous comma

It causes problems with older versions of IE.
MDL-36571 qtype multichoice: don't corrupt unicode characters.

It seems that \s includes non-breaking space, and the typical one-byte
representation of that is the same as some parts of multibyte unicode
characters. Therefore, you need to include the u modifer on the regular
expressions.

Also, remove any number of <br /> at the end of the answer.

Thanks to Joseph Rézeau and Jean-Michel Vedrine for working out what the
problem was, and how to fix it.
MDL-36683 qtype match restore: better subq indentification.

This is very similar to what MDL-30018 did for question_answers.
Merge branch 'MDL-36615-master' of git://github.com/ankitagarwal/moodle
MDL-36703 very basic support for enrolments in data generator
Merge branch 'wip-mdl-36351' of git://github.com/rajeshtaneja/moodle
Merge branch 'wip-mdl-36352' of git://github.com/rajeshtaneja/moodle
MDL-33863 question restore: better hint identification.

This is very similar to what MDL-30018 did for question_answers.
Merge branch 'MDL-36683' of git://github.com/timhunt/moodle
Merge branch 'MDL-26439_message_search' of git://github.com/andyjdavis/moodle
MDL-36592 calendar: Parse all line endings

Conflicts:

	lib/bennu/iCalendar_components.php
Merge branch 'MDL-36592-master' of git://github.com/ankitagarwal/moodle
Merge branch 'MDL-30871-master' of git://github.com/FMCorz/moodle
Merge branch 'MDL-31847_master' of git://github.com/lazydaisy/moodle
Merge branch 'MDL-32806_master' of git://github.com/lazydaisy/moodle
Merge branch 'MDL-32865' of git://github.com/jmvedrine/moodle
MDL-30377 forum: do not allow users to view not yet started or expired discussions
MDL-36679: Assignment revert to draft should user the selected user id, not the logged in user id.