Merge branch 'MDL-70374' of https://github.com/timhunt/moodle