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