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