Merge branch 'MDL-45729-master' of http://github.com/damyon/moodle
Merge branch 'MDL-45767_returnInstanceid' of https://github.com/moodlerooms/moodle
Merge branch 'MDL-45761-master' of https://github.com/merrill-oakland/moodle
Merge branch 'wip-MDL-44309-master' of https://github.com/deraadt/moodle
MDL-45245 html_writer::select_time does not respect 5th parameter "attributes"
Merge branch 'wip-MDL45846' of git://github.com/jennymgray/moodle
MDL-44871 Behat: Add tests for Atto functionalities (some of them)
Merge branch '45524-28' of git://github.com/samhemelryk/moodle
Merge branch 'MDL-20154-master' of git://github.com/merrill-oakland/moodle
Merge branch 'MDL-45813-scheduled_task' of git://github.com/mudrd8mz/moodle
MDL-45763 question: Correct random question text if set to true or false
Merge branch 'MDL-45763-master' of git://github.com/merrill-oakland/moodle
MDL-45418 Files: Adding publisher docs to Filetypes
MDL-45418 Files: Adding upgrade steps for publisher docs

Conflicts:
	lib/db/upgrade.php
	version.php
MDL-45943: Replacement for publisher icons
Merge branch 'MDL-45418' of git://github.com/stronk7/moodle
Merge branch 'MDL-45579-master' of git://github.com/FMCorz/moodle
Merge branch 'MDL-45808-master' of git://github.com/FMCorz/moodle
Merge branch 'm28_MDL-29708_Typo_Extra_Slashes' of https://github.com/scara/moodle
MDL-45870 mod_assign: Behat test covering some outcome usage