Merge branch 'MDL-77930-401' of https://github.com/rjnl/moodle into MOODLE_401_STABLE