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