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