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