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