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