Merge branch 'MDL-41504-master' of git://github.com/andrewnicols/moodle
Merge branch 'wip-mdl-42491-master' of git://github.com/deraadt/moodle
Merge branch 'MDL-42538_master' of git://github.com/dmonllao/moodle
MDL-42558 events: Enrollment actions are administration not teaching
Merge branch 'wip-mdl-30812' of git://github.com/rajeshtaneja/moodle
MDL-35146 mod_wiki: fixed issue where pages for deleted groups caused an error on restore
MDL-35146 mod_wiki: fixed variable typo and altered code to conform to Moodle guidelines
Merge branch 'MDL-38419' of https://github.com/moodlerooms/moodle
Merge branch 'w44_MDL-42110_m26_addoninstaller' of https://github.com/skodak/moodle
MDL-42557 Events: Removed timemodified hack from course_deleted event
MDL-42028 EditPDF: replace the loading icon by a progress bar
Merge branch 'MDL-42028-master-4' of git://github.com/mouneyrac/moodle
Merge branch 'MDL-42285-master' of git://github.com/phalacee/moodle
MDL-22669 course: Display section number for orphaned activities
Merge branch 'wip-mdl-42283' of git://github.com/rajeshtaneja/moodle
Merge branch 'wip-mdl-41811' of git://github.com/rajeshtaneja/moodle

Conflicts:
	login/change_password.php
MDL-42574 blocks: Fix strict standards warning in community block
MDL-42557 Events: added idnumber to course_deleted event data
MDL-42573 skydrive: support non-js login scheme

This is actually not especially useful because Microsoft don't currently
support non-JS login. But its possible they could make it work in
future. And at least the user gets an error from MS rather than blank
screen.
Merge branch 'MDL-22669-master' of git://github.com/FMCorz/moodle