Merge branch 'm28_MDL-47097' of https://github.com/totara/moodle
Merge branch 'MDL-47200-master' of git://github.com/jleyva/moodle

Conflicts:
	version.php
Merge branch 'MDL-47294-master' of git://github.com/FMCorz/moodle
Merge branch 'm28_MDL-46127' of https://github.com/totara/moodle

Conflicts:
	theme/bootstrapbase/style/moodle.css
MDL-47301 libraries: Update Typo3 to v4.7.19
MDL-47301 libraries: Patch Typo3 for Moodle's use
Merge branch 'MDL-47195-master' of git://github.com/andrewnicols/moodle
MDL-47195 force an upgrade for classloader changes
Merge branch 'MDL-47385-master' of https://github.com/DmitryNefedov/moodle
MDL-45893 behat: quick fix for usermenu logout button

(This needs revisiting properly - I am not an xpath expert)
Merge branch '3034-28' of https://github.com/samhemelryk/moodle
MDL-46171 assign: Fix for the update script on MySQL.
MDL-45893 user_menu: fix to hide user_pictures from screen readers
Merge branch 'MDL-45893-master-fix' of https://github.com/jethac/moodle
Merge branch 'MDL-46171-master-fix1' of http://github.com/damyon/moodle
MDL-46171 dml: DML unit test for tricky SQL in assign upgrade

This tests a workaround for set_field_select where the set table and from table are the same.
Merge branch 'MDL-46171-master-fix1' of http://github.com/damyon/moodle
MDL-47474 Calendar export: Fix user id in authorization check
MDL-42993 auth: spaces removed from usernames by default only

Functionality by default does not change with this patch.
However spaces are no longer stripped when cleaning usernames IF
$CFG->extendedusernamechars has been set.

Also included 2 trim statements where small issues were found with reading
external usernames in that  were not filtered for trailing whitespaces.
Merge branch 'MDL-46282-master' of git://github.com/andrewnicols/moodle

Conflicts:
	version.php