Merge branch 'wip-MDL-41967-25' of git://github.com/abgreeve/moodle into MOODLE_25_STABLE
Merge branch 'MDL-41659_25' of https://github.com/totara/openbadges into MOODLE_25_STABLE
MDL-37181 backup: stopped setting the status of unscheduled backups to skipped
Merge branch 'w41_MDL-42047_m25_cohortdel' of https://github.com/skodak/moodle into MOODLE_25_STABLE
Merge branch 'm25_MDL-40226_Add_JNLP_MIME_Type_Support' of https://github.com/scara/moodle into MOODLE_25_STABLE
Merge branch 'MDL-39776-25' of git://github.com/phalacee/moodle into MOODLE_25_STABLE
MDL-42054 fix incorrect email redirection in unit tests
Merge branch 'w41_MDL-42054_m25_phpmailertesting_i' of https://github.com/skodak/moodle into MOODLE_25_STABLE
MDL-41672 Add html2text unit test for multiple occurrences of the same URL
MDL-41672 Fix html2text processing of multiple occurrences of the same URL
MDL-42065 core_grade: Modified some grade_item queries for improved performance

* Modified 2 queries in grade_item::depends_on to improve performance
* Added additional unit tests to cover those queries better
Merge branch 'wip-mdl-41744-m25' of https://github.com/rajeshtaneja/moodle into MOODLE_25_STABLE
Merge branch 'MDL-37153_25' of https://github.com/pauln/moodle into MOODLE_25_STABLE
MDL-41379 core_outcome: added some CSS to the course outcome table to make it display nice
Merge branch 'MDL-41379_outcomes_25' of https://github.com/andyjdavis/moodle into MOODLE_25_STABLE
MDL-41379 - fix whitespace
MDL-42167 Update workshop assessment record only when really changed

Under certain conditions there is nothing to actually update here. The
$DB->update_record() would throw an exception here.
MDL-37528 Libraries: Fix gesture + mouse issues with YUI

This addresses issues with devices which support both mouse and gesture
input devices whereby the presence of gesture support on the device causes
mouse interactions to be ignored.

This has the potential to cause issues with multiple events being triggered
for the same action, but we do not have this issue in core, and few
third-party plugins support drag and drop in such a way that this may be an
issue.

This is fixed in the latest version of YUI in a similar way, and the
addition of a new system to only trigger the event from the first action to
be triggered.
MDL-42013 behat: I should (not)? see checking visibility

Only for non-Javascript tests. If the step
is named I should/should not see whatever
is makes sense that has to be visible.
MDL-42072 badges: fixed cookie use