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