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