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