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