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