Merge branch 'MDL-42115-master' of git://github.com/jamiepratt/moodle
Merge branch 'MDL-29441-master' of git://github.com/andrewnicols/moodle
Merge branch 'MDL-42459-master' of git://github.com/damyon/moodle

Conflicts:
	version.php
MDL-42459 upgrade: fix upgrade step ordering

Also incremented version to be safe
Merge branch '40976-26' of git://github.com/samhemelryk/moodle
Merge branch 'MDL-42340-master' of git://github.com/andrewnicols/moodle

Conflicts:
	lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js
	theme/bootstrapbase/style/moodle.css
Merge branch 'MDL-42112-master' of git://github.com/damyon/moodle
Merge branch 'w43_MDL-42440_m26_authenable' of https://github.com/skodak/moodle
MDL-24380 Chat: autoscroll help popup incorrect and doesn't display fully
MDL-42476 report_progress: don't browser sniff for SVG support

Use feature detection, its more robust and better practice.
Merge branch 'install_master' of git://git.moodle.org/moodle-install
on demand release 2.5beta+
MDL-42352 assignfeedback_editpdf - prevent scrolling when clicking on buttons
on demand release 2.6beta+

Thanks to all who entered the competition to find the mistake in the
last commit. It was spotted by none other than super-awesome Moodler
Justin Filip.

He collects a beer from me at our next available meeting.
MDL-42482 assignfeedback_editpdf - prevent blank comments from disappearing when the menu is opened
MDL-42355 assignfeedback_editpdf - do not start a new comment immediately when deselecting the old comment
Merge branch 'w43_MDL-37813_m26_filterall' of https://github.com/skodak/moodle
MDL-42486 enrol: fixed bug in URL on manage enrol plugins page
Merge branch '42316-26' of git://github.com/samhemelryk/moodle
Merge branch '42170-26' of git://github.com/samhemelryk/moodle