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