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