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