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