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