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