Merge branch 'MDL-38254' of git://github.com/rwijaya/moodle
Merge branch 'wip-mdl-35883' of git://github.com/rajeshtaneja/moodle
MDL-26649 forms: ensure that both necessary variables are set before altering calendar image
MDL-38973 Assignment - Attempt history not displaying for blind marking

This change makes the attempt history display for teachers and students
even when there is no grade (e.g. blind marking). It also will show the previous
attempt in the grading table when a submission has been newly reopened (instead
of a blank submission).
Merge branch 'MDL-19072' of git://github.com/jmvedrine/moodle
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.
Merge branch 'MDL-38973-master' of https://github.com/damyon/moodle
MDL-38989 detect changed timeout in tests

The trouble is that PHPUnit should ideally test mostly low level libraries that should not change the timeouts.
MDL-38989 add missing test timeout reset
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).
MDL-38937 behat: New test

According to MDLQA-39, a teacher can
choose whether to provide a printer-friendly
glossary entries list
MDL-38939 behat: Allow admin setting to be set in non-JS sessions
MDL-38939 behat: New test

According to MDLQA-33, a teacher can set
whether glossary entries are always editable.
MDL-38970 behat: New test

According to MDLQA-65, a teacher can
prevent or allow assignment submission
changes.
Merge branch 'w15_MDL-38989_m25_ttfinal' of git://github.com/skodak/moodle
Merge branch 'MDL-38970_master' of git://github.com/dmonllao/moodle
Merge branch 'MDL-38939_master' of git://github.com/dmonllao/moodle
Merge branch 'MDL-38937_master' of git://github.com/dmonllao/moodle
Merge branch 'MDL-38525-master' of https://github.com/damyon/moodle
Merge branch 'm25_MDL-39061_Trivial_incorrect_MD' of https://github.com/scara/moodle