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