Merge branch 'MDL-74826-400' of https://github.com/rmady/moodle into MOODLE_400_STABLE