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