MDL-42286 questionbank: add behat tests for putting questions in categories MDLQA-95
MDL-28463 conditionlib: 10 minutes lifetime of cached grades
Merge branch 'install_25_STABLE' of git://git.moodle.org/moodle-install into MOODLE_25_STABLE
weekly release 2.5.2+
MDL-42664 Fix the filter_manager instantiation

For legacy reasons, the $CFG->perfdebug uses values 7 for disabled and 15 for
enabled. Because of this typo, Moodle has always created instance of the slower
performance_measuring_filter_manager instead of the standard filter_manager,
regardless the perfdebug setting.
MDL-42429 mod_lesson: removed unnecessary conditional check
MDL-42663 mod_lesson: Move definitions to show_clock()

Seems that the required data is not always set
before timer.js is included.
Merge branch 'MDL-42287-25' of git://github.com/ankitagarwal/moodle into MOODLE_25_STABLE
MDL-42496 backport MDL-41245 add-on install request redirection fix
MDL-42044 standardise list of unzipped files in add-on installer
Merge branch 'wip-MDL-28463-m25' of git://github.com/marinaglancy/moodle into MOODLE_25_STABLE
MDL-42648 lib: Clean theme throws exception if set_pagelayout is called too late.
MDL-42521 mod_feedback - Feedback does not show line graphs in Clean theme
Merge branch 'MDL-38850_m25' of git://github.com/rwijaya/moodle into MOODLE_25_STABLE
Merge branch 'w45_MDL-42496_m25_addonredir' of https://github.com/skodak/moodle into MOODLE_25_STABLE
Merge branch 'MDL-42664-performance_measuring_filter_manager_25' of git://github.com/mudrd8mz/moodle into MOODLE_25_STABLE
Merge branch 'MDL-42663_25' of git://github.com/dmonllao/moodle into MOODLE_25_STABLE
Merge branch 'MDL-42521_25' of git://github.com/grabs/moodle into MOODLE_25_STABLE
MDL-41820 XSS in the quiz responses report.

Thanks to Michael Hess for finding this bug and reporting it to us.
MDL-41941 clean message text