MDL-45603 cache Fix the mappingsonly option to work as advertised.
MDL-44711 navigation: better handling of course expansion exception
MDL-44974 admin: repositioned call to initialise renderer
Merge branch 'MDL-45561-master' of git://github.com/jethac/moodle
MDL-45605 Phpunit: Do not call gc_collect_cycles as part of reset.

This takes 25% of the time in running tests and there is no benefit. The
behaviour of destructors is the same before/after the patch.
MDL-45607 events: changed the context passed to the user_profile_viewed event
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