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