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