MDL-42929 backup: keep own version & release updated.
MDL-40223 SCORM: update scorm->launch param after restore - also check that scorm->launch is valid.
MDL-41695 SCORM: allow unlimited decimal places in CMIDecimal
MDL-42060 block_course_list: fixed sorting of mycourses
MDL-42930 Add 2.6.0 upgrade line
MDL-42612 add support for Russian Ruble in PayPal
Merge branch 'm26_MDL-40223' of git://github.com/danmarsden/moodle into MOODLE_26_STABLE
Merge branch 'MDL-42930-26' of git://github.com/damyon/moodle into MOODLE_26_STABLE

Conflicts:
	mod/scorm/db/upgrade.php
MDL-42884 core_user: fixed issue when deleting users with invalid emails throws invalidusername exception
MDL-42582 Availability: Restriction display incorrect for multi-para Labels

When a label has multiple paragraphs, its name (converted to plain text)
contains a line feed. Due to an error in regular expressions that don't
accept the line feed, this caused incorrect display on the course page
when that label is shown as a requirement for accessing another activity.
Merge branch 'm26_MDL-41695' of git://github.com/danmarsden/moodle into MOODLE_26_STABLE
Merge branch 'MDL-42808-master' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE
MDL-42880 quiz settings: remove unnecessary disabledif rules.

These rules were causing problems in the case where the form was
sumitted with validation errors. In that case, the During the attempt ->
The attempt checkbox was becoming unset, and hence the other During the
attmept checkboxes became disabled, and the values were not saved.

Thanks to Sam Marshall for suggesting this fix.
Merge branch 'MDL-42100_master' of https://github.com/markn86/moodle into MOODLE_26_STABLE
Merge branch 'MDL-42853-master' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE

Conflicts:
	theme/bootstrapbase/style/moodle.css
MDL-42184 bootstrapbase: popup should have no header
MDL-42852 lib: Blocks disappear in Clean in RTL.

Conflicts:
	theme/bootstrapbase/style/moodle.css
MDL-42852 theme_bootstrapbase: fixed whitespace
MDL-42865 Make XMLDB foreign key check more robust.

Otherwise, installing one bad add-on can completely break this report.
MDL-42863 make capabilities overview more fault-tolerant.