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