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