Merge branch 'MDL-44634-master' of https://github.com/dbezborodovrp/moodle
Merge branch 'MDL-45533-27' of git://github.com/FMCorz/moodle
Merge branch 'wip-MDL-45483-master' of https://github.com/kwiliarty/moodle
MDL-45537 mod_assign: Requiring locallib for class assign
Merge branch 'MDL-23566' of https://github.com/aolley/moodle
Merge branch 'MDL-32543' of https://github.com/danielneis/moodle

Conflicts:
	version.php
MDL-32543 upgrade: Increment the version bump

Conflicts:
	version.php
MDL-45466 forum: performance improvement for mass (un)subscriptions
Merge branch 'wip-MDL-34914-master' of git://github.com/marinaglancy/moodle
Merge branch 'MDL-41109-master' of git://github.com/andrewnicols/moodle
MDL-45371 behat: Tests for block glossary_random
MDL-45468 editor_atto: Check that the common ancestor is within the editor

Conflicts:
	lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
MDL-45239 editor_atto: The editor cannot be active if it is not the active element

FireFox thinks that you can have an active selection on an element which
currently does not have focus. How this can be the case is a mystery.

Conflicts:
	lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
MDL-43669 messaging Enable sending email only from no-reply address
Merge branch 'MDL-45478-master' of git://github.com/sammarshallou/moodle
MDL-45469 Conditional availability: Restrict by text area broken

It has never worked, because the data for text area fields is not
loaded into the $USER object.

Changing it so that the dropdown list does not include these types
of field.
Merge branch 'MDL-45432-master' of https://github.com/lucisgit/moodle
Merge branch 'MDL-45455' of git://github.com/timhunt/moodle
Merge branch 'MDL-45527-27' of git://github.com/FMCorz/moodle
Merge branch 'MDL-43833' of git://github.com/timhunt/moodle