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