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