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