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