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