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