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