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