Merge branch 'MDL-79274_402' of https://github.com/catalystfd/moodle into MOODLE_402_...