Merge branch 'wip-MDL-39062-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE
Merge branch 'MDL-40633_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE
Merge branch 'MDL-39563-24' of git://github.com/jleyva/moodle into MOODLE_24_STABLE
MDL-39563: Change to use $CFG consistently
MDL-40585 backup: cache XML parent paths

For $this->groupedpaths, using a key is faster as there is
no need to do in_array searches.

Parent cache allows dirname calls to be substantially reduced.
2048 was chosen as a cache size as this class operates on chunks
of the restore at a time, 8k questions produces a parent cache of
about 500 paths and uses 300K of memory.  Scaling up to 2048 will
use about 1.2M of RAM for really large restores.  This is acceptable
for the 48% function call reduction and the 10% runtime improvement
seen.
Merge branch 'wip-MDL-38747-MOODLE_24_STABLE' of https://github.com/satrun77/moodle into MOODLE_24_STABLE
MDL-40584 backup: Query db once per category in precheck

The cache is function local and testing against a large database
indicates 10k questions is a large category.  Restore already
uses MEMORY_EXTRA and that will have enough space for the couple
of megabtyes a local sql hash will introduce.
MDL-40555 cache: Static store is searchable
MDL-40555 cache: implemented unit tests for default search functionality
MDL-40680 store_memcached: fix serialiser options

* Use correct lang string for SERIALIZER_IGBINARY
* Use PARAM_INT for the parameter
MDL-35851 Lesson module: fix page order id for import questions. Add upgrade script to fix lesson pages corrupted links

Conflicts:

	mod/lesson/db/upgrade.php
	mod/lesson/version.php
Merge branch 'MDL-40538_24' of https://github.com/mr-russ/moodle into MOODLE_24_STABLE
MDL-40524: mod_wiki: Display comments in order
Merge branch 'w29_MDL-40558_m24_guestdelete' of https://github.com/skodak/moodle into MOODLE_24_STABLE
Merge branch 'MDL-40195_24' of git://github.com/aolley/moodle into MOODLE_24_STABLE
MDL-35851 lesson: removed expensive upgrade step.

Just deal with the bad data when displaying the lesson instead.

Conflicts:

	mod/lesson/db/upgrade.php

Conflicts:

	mod/lesson/db/upgrade.php
	mod/lesson/version.php
Merge branch 'MDL-35851-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE
Merge branch 'MDL-40555-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE

Conflicts:
	cache/stores/static/lib.php
Merge branch 'wip-MDL-40621-m24' of git://github.com/marinaglancy/moodle into MOODLE_24_STABLE
MDL-40423 fix creation of new install.xml in subplugins