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