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