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