Merge branch 'MDL-63371' of git://github.com/timhunt/moodle