MDL-46737 SCORM: correct dml syntax.
MDL-46619 Forum: author showing in Q and A forum
MDL-46639 mod_scorm: Fix load of simple AICC content

Thanks to Ian Wild for the report and suggested patch.
MDL-39233 mod_url: fix php notice
MDL-39233 mod_url: added unittest for get_course_content
MDL-46961 SCORM: JavaScript Hoisting issue.
MDL-46539 assign calendar: Fix lastcron value for assign cron
MDL-43639: Prevent user updated event on every login

If auth plugin prevents local passwords, then user
is updated and event is triggered on every login.
MDL-45952 feedback: non-respondents in groupings

Fixes feedback non-respondents list to show only members in groups in
the selected grouping if "Available for group members only" is selected.
MDL-46633 chat: Chat send button gets stuck

Conflicts:
	mod/chat/gui_ajax/module.js
MDL-46979 backup: remove duplicate string.

Thanks to Matt Sammarco for spotting this.
MDL-37312 backup: Keep course idnumber on same site course restore

When the course idnumber is set during a same site course restore,
retain the course idnumber if there are no duplicates.
MDL-46902 core_course: display meaningful message when no courses found
MDL-39840 environment: add support for environment.xml in plugins

New features:

* environment.xml files in all types of plugins
* support for plugin strings via new optional plugin attribute in FEEDBACK
* support for class_name::method_name custom callbacks and classloader
MDL-46985 Added 7-Zip and RAR MIME types.
Merge branch 'm26_MDL-46737' of https://github.com/danmarsden/moodle into MOODLE_26_STABLE
Merge branch 'MDL-46619-2.6-visisble-authors-qanda' of https://github.com/amandadoughty/moodle into MOODLE_26_STABLE
MDL-46619 Forum: whitespace fixes
Merge branch 'wip-MDL-39233-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE
MDL-46852 mod_lesson: More accurate comparison of shortanswer answers