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