Merge branch 'MDL-77611_400' of https://github.com/timhunt/moodle into MOODLE_400_STABLE