Merge branch 'MDL-46212' of git://github.com/timhunt/moodle

Conflicts:
	question/type/calculated/question.php
Merge branch '46208-28' of git://github.com/samhemelryk/moodle
Merge branch 'MDL-46193' of git://github.com/mr-russ/moodle
Merge branch 'm28_MDL-46144' of https://github.com/totara/moodle
Merge branch 'mdl45982-master' of https://github.com/tlock/moodle
Merge branch 'MDL-46200-master' of git://github.com/danpoltawski/moodle
Merge branch 'MDL-19270_master' of https://github.com/nadavkav/moodle
MDL-19270 core_text: added unit tests for strrev
Merge branch 'MDL-46016_master' of https://github.com/markn86/moodle
MDL-46280 filter_activitynames: sort activities by length in reverse order
Merge branch 'wip-MDL-46059-master' of git://github.com/abgreeve/moodle
MDL-46059 mod_lti: fixed invalid decimals attribute
MDL-37812 user: separate preferences into separate section in editform
MDL-37812 user: added defaults for user preferences
MDL-37812 tool_uploaduser: apply default values for user preferences
MDL-37812 user: apply default values for user preferences when creating user
MDL-46223 Improve the rubric output
MDL-46223 Improve the marking guide output
MDL-46227 Fix XSS in scheduled tasks
MDL-45599 Fix tiny grammatical errors in the plugin installer