Merge branch 'w49_MDL-36447_m23_gdtest' of git://github.com/skodak/moodle into MOODLE_23_STABLE
Merge branch 'MDL-30700-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE
Merge branch 'MDL-36321_message_participants_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE
Merge branch 'wip_23_mdl-37088_bad_operator_ldap_sync_user' of https://github.com/iarenaza/moodle into MOODLE_23_STABLE
Merge branch 'MDL-35593-23' of git://github.com/mouneyrac/moodle into MOODLE_23_STABLE
Merge branch 'MDL-29805-23' of git://github.com/mouneyrac/moodle into MOODLE_23_STABLE
MDL-29805 redirect: added check REQUIRE_CORRECT_ACCESS is true
Merge branch 'MDL-32880_23_3' of git://github.com/pauln/moodle into MOODLE_23_STABLE
Merge branch 'MDL-27619_23' of git://github.com/pauln/moodle into MOODLE_23_STABLE
Automatically generated installer lang files
Merge branch 'm23_MDL-35737' of git://github.com/danmarsden/moodle into MOODLE_23_STABLE
MDL-36644 Assignment: prepend the course upload limit to the options array

Ensure that the course upload limit is the first option in the list of available choices for the Maximum submission size select.
Merge branch 'wip-MDL-33448-m23' of git://github.com/samhemelryk/moodle into MOODLE_23_STABLE
MDL-29334 mod_data: if site-wide presets created in <= 1.9 exist convert them to 2.x
MDL-32639 files: Improved File Manager download and zip support

Conflicts:

	lib/filestorage/zip_packer.php
MDL-32639 files: Zipping a folder does not overwrite existing files
MDL-36897 quiz review: fixup previous commit.
MDL-37014 repository_webdav - strip the server URL from file & folder paths returned by webdav lib (if present)
MDL-37078: Restore - section restore fails with multiple availability conditions
Merge branch 'MDL-36897_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE