Automatically generated installer lang files
MDL-38541 Restrict calling rebuild_course_cache() from upgrade process

only plugins upgrade scripts can call rebuild_course_cache() and for clearing cache only.
Merge branch 'wip-MDL-38541-m24' of git://github.com/marinaglancy/moodle into MOODLE_24_STABLE
Merge branch 'MDL-38766/MOODLE_24_STABLE' of github.com:kemitix/moodle into MOODLE_24_STABLE
Merge branch 'wip-MDL-38887-m24' of git://github.com/marinaglancy/moodle into MOODLE_24_STABLE
Merge branch 'w14_MDL-38798_m24_php55' of git://github.com/skodak/moodle into MOODLE_24_STABLE
Merge branch 'wip-MDL-38442-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE
MDL-19072 XHTML export for match questions fix for distractors
MDL-39000 Conditional activities: Section condition restore errors
MDL-38912 fix incorrect timeout reset
MDL-29877 core_grade:add some upgrade code to fix broken grade items introduced by bad restores
Merge branch 'MDL-38999_24' of git://github.com/stronk7/moodle into MOODLE_24_STABLE
Merge branch 'MDL-38254_m24' of git://github.com/rwijaya/moodle into MOODLE_24_STABLE
Merge branch 'wip-mdl-35883-m24' of git://github.com/rajeshtaneja/moodle into MOODLE_24_STABLE
Merge branch 'MOODLE_24_MDL35144' of git://github.com/thepurpleblob/gumoodle into MOODLE_24_STABLE
Merge branch 'MDL-19072_24' of git://github.com/jmvedrine/moodle into MOODLE_24_STABLE
MDL-38525: Assignment - print exception message when assignment upgrade fails.

Change to use getMessage() from the Exception class will prevent "{$a}" when
$e->error is null.
MDL-38525: Assignment upgrade - Error with comments for unenrolled students.

Students with comments on 'upload' assignments cause errors for the upgrade
tool if they are no longer enrolled. The solution is to allow siteadmin to
see student submissions even if the student is not currently enrolled (you
must be siteadmin to run the upgrade tool).
Merge branch 'MDL-38525-24' of https://github.com/damyon/moodle into MOODLE_24_STABLE
MDL-35144 Categories - Allow editing by custom roles

Users with category:manage or course:create should be able to edit
the course/category.php page.