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