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