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