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