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