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-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-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
Merge branch 'MDL-46539-fix-26' of https://github.com/jmarthaler/moodle into MOODLE_26_STABLE
Merge branch 'm26_MDL-46639' of git://github.com/danmarsden/moodle into MOODLE_26_STABLE
Merge branch 'm26_MDL-46961' of https://github.com/danmarsden/moodle into MOODLE_26_STABLE
Merge branch 'm26_MDL-46985_7ZIP_RAR_MIME_types_missing' of https://github.com/scara/moodle into MOODLE_26_STABLE
MDL-46911 Database activity: jump to correct place in list after (un)approve