Merge branch '48335-29' of git://github.com/samhemelryk/moodle
Merge branch 'MDL-40241_master' of https://github.com/dmonllao/moodle
Merge branch 'wip-MDL-32547-master-v2' of git://github.com/abgreeve/moodle

Conflicts:
	version.php
Merge branch 'MDL-48342' of git://github.com/jmvedrine/moodle
Merge branch 'wip_MDL-48420_m29_lasttypo' of https://github.com/skodak/moodle
Merge branch 'm29_MDL-48359' of https://github.com/totara/moodle
Merge branch 'm29_MDL-48317' of https://github.com/totara/moodle
Merge branch 'wip_MDL-47830_m29_pwrotation' of https://github.com/skodak/moodle
Merge branch 'MDL-40419-master-2nd' of git://github.com/FMCorz/moodle
Merge branch 'MDL-47628-master' of https://github.com/sammarshallou/moodle

Conflicts:
	availability/yui/build/moodle-core_availability-form/moodle-core_availability-form-min.js
Merge branch '48374-29' of git://github.com/samhemelryk/moodle
MDL-48285 webservices: default timeend to infinity and beyond
Merge branch 'MDL-34627_master' of https://github.com/dmonllao/moodle
Merge branch 'MDL-48285_master' of git://github.com/dmonllao/moodle
Merge branch 'wip-mdl-48290' of https://github.com/rajeshtaneja/moodle
Merge branch '36236-29' of git://github.com/samhemelryk/moodle
MDL-36236 caching: improved help string

(and Dan keeping codechecker happy)
MDL-48374 behat: improved page load detection

Check that page load detection was correctly started before testing that a
new page was loaded.

Without this, it is possible to have mutliple subsequent cases of:
    And a new page should have loaded since I started watching

Without first starting the page load detection.
MDL-48374 behat: Check flag before searching for span on page
Merge branch '26226-48304-29' of git://github.com/samhemelryk/moodle