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