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