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