UoN Changes for Moodle 24 26 stable

HI Dan,

UoN Changes for 24-26 branch.

Joe