Moodle 24 stable

Dear Julian,

Changes for MDL-36095

Cheers,

Gareth