MDL-38545 Reports: PHP Strict Standards error in graph.php
MDL-39166 auth_ldap Add triggers for user created/updated events.
MDL-39409 auth/cas pass web proxy settings along to phpCAS
MDL-39487 mod/assign: fixed ID number of grade item changing
MDL-39743 assign: Fix missing capability check for "grant extension"

Conflicts:

	mod/assign/locallib.php
MDL-39317 assign: Fix for submitted filter on grading table.

Some old upgraded assignments have no timecreated column so use
a different one to check for a valid submission.
MDL-34085 Fix the backup options names in core_course_duplicate_course

Fix the option names to match those used by the backup subsystem.
MDL-39945 qtype multichoice was not comparing blank responses correctly.
MDL-39932 mod_feedback - Mapping Feedback when Course is Deleted - thx to David N. Johnson
MDL-21097 Correctly check capabilities for course settings items

- Make sure that items in course settings (and frontpage settings) are shown depending on user capabilities
- Make sure user is able to turn editing on on the page even if he has only limited number of seciton/modules capabilities
MDL-37332 portfolio: don't add double slashes

get_filepath() always returns trailing slash.

This breaks windows export - thanks to Jason Platts
MDL-38731 course: split course group settings header

Allow translators to translate the heading differently.

AMOS BEGIN
  CPY [groups,group],[groupsettingsheader,group]
AMOS END

Conflicts:
	course/edit_form.php
Fixing MDL-39710: setting to limit student access to rubric now checked.
MDL-39710 Don't display rubric and guide preview unless option checked
MDL-39465 detect environment problems in tests

This should help explain why something else fails.
MDL-39835 theme_sky_high: Fix for footer to display correctly in higher resolutions.
MDL-39416 do not try to get detailed perflog info before PAGE int
Merge branch 'MDL-39487_24' of https://github.com/IOC/moodle into MOODLE_24_STABLE
Merge branch 'MDL-39932_24' of git://github.com/grabs/moodle into MOODLE_24_STABLE
Merge branch 'wip-MDL-39710-m24' of git://github.com/marinaglancy/moodle into MOODLE_24_STABLE