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