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