Moodle 24 stable

Dear Julian,

Changes for MDL-36095 - and umm appears to be more!  No idea why.

Cheers,

Gareth