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