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