Merge branch 'MDL-46061-master' of git://github.com/FMCorz/moodle
MDL-41448 assign: Fix all plugin styles - they should be restricted to mod assign pages.
MDL-41448 Assign: Add note to theme/upgrade.txt about CSS changes in mod_assign
Merge branch 'MDL-41448-master' of git://github.com/damyon/moodle
Merge branch 'MDL-45983-master' of git://github.com/damyon/moodle
Merge branch 'MDL-45933-master' of git://github.com/damyon/moodle
Merge branch 'MDL-46031' of git://github.com/timhunt/moodle
Merge branch 'MDL-46022-master' of git://github.com/jethac/moodle

Conflicts:
	theme/bootstrapbase/less/moodle/modules.less
	theme/bootstrapbase/style/moodle.css
Merge branch 'wip_MDL-45985_m28_dbschema' of https://github.com/skodak/moodle
MDL-1626 mod_forum: Correct SQL syntax when fetching subscriptions
MDL-10115 User profile: Use title to aid in the ellipsis link being understood by screen readers
Merge branch 'MDL-10115-master' of git://github.com/xow/moodle
Merge branch 'MDL-1626-master' of git://github.com/andrewnicols/moodle
Merge branch 'MDL-45652_master' of https://github.com/markn86/moodle
Merge branch 'MDL-41258-master' of git://github.com/andrewnicols/moodle

Conflicts:
	mod/forum/tests/maildigest_test.php
Merge branch 'MDL-46045-master' of git://github.com/damyon/moodle
MDL-46045 whitespace fix
Merge branch 'MDL-45445_master' of https://github.com/markn86/moodle
MDL-43365 lib: added better means of renaming classes for autoloading

I've added a better means of renaming classes for autoloading and
handling the deprecation of the original class name.
This system records renamed classes in db/renamedclasses.php and
when a renamed class is requested a debugging notice is printed
and a class alias is created so that the calling code both works
and is informed of the deprecation.
MDL-43365 lib: converted text and plugin deprecated classes to new scheme

Four core library classes renamed for autoloading with deprecated stubs
have been converted to the new scheme for autoloading.
They are:

 * textlib
 * collatorlib
 * plugin_manager
 * plugininfo_base

These will be removed in 2.9 by MDL-46124