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