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