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