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